From: ModeSevenIndustrialSolutions <mwatkins@linuxfoundation.org>
Date: Wed, 3 Sep 2025 11:35:56 +0000 (+0100)
Subject: Test: New github2gerrit workflow/setup
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=0a04a69bd105a62f3c2cb730e4ea6827ec673f42;p=portal-ng%2Fbff.git

Test: New github2gerrit workflow/setup

Issue-ID: CIMAN-33

Replace legacy GitHub2Gerrit workflow for testing.

Change-Id: Ibcf1bd4baee0c8e6e0ee0c4be93df8660e28590a
Signed-off-by: ModeSevenIndustrialSolutions <mwatkins@linuxfoundation.org>
---

diff --git a/.github/workflows/github2gerrit-python.yaml b/.github/workflows/github2gerrit-python.yaml
deleted file mode 100644
index 2ad303e..0000000
--- a/.github/workflows/github2gerrit-python.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
----
-# SPDX-License-Identifier: Apache-2.0
-# SPDX-FileCopyrightText: 2025 The Linux Foundation
-
-name: github2gerrit-python
-
-# yamllint disable-line rule:truthy
-on:
-    workflow_dispatch:
-    inputs:
-      preserve_github_prs:
-        description: "Do not close GitHub PRs after pushing to Gerrit"
-        required: false
-        default: false
-        type: boolean
-    pull_request_target:
-        types: [opened, reopened, edited, synchronize]
-        branches:
-            - master
-            - main
-
-concurrency:
-    # yamllint disable-line rule:line-length
-    group: ${{ github.workflow }}-${{ github.run_id }}
-    cancel-in-progress: true
-
-jobs:
-    call-in-g2g-workflow:
-        permissions:
-            contents: read
-            pull-requests: write
-        # yamllint disable rule:line-length
-        uses: ModeSevenIndustrialSolutions/github2gerrit-python/.github/workflows/github2gerrit.yaml@main
-        with:
-            GERRIT_KNOWN_HOSTS: ${{ vars.GERRIT_KNOWN_HOSTS }}
-            GERRIT_SSH_USER_G2G: ${{ vars.GERRIT_SSH_USER_G2G }}
-            GERRIT_SSH_USER_G2G_EMAIL: ${{ vars.GERRIT_SSH_USER_G2G_EMAIL }}
-            USE_PR_AS_COMMIT: true
-            PRESERVE_GITHUB_PRS: true
-        secrets:
-            GERRIT_SSH_PRIVKEY_G2G: ${{ secrets.GERRIT_SSH_PRIVKEY_G2G }}
diff --git a/.github/workflows/github2gerrit.yaml b/.github/workflows/github2gerrit.yaml
index e119f8f..a45eab5 100644
--- a/.github/workflows/github2gerrit.yaml
+++ b/.github/workflows/github2gerrit.yaml
@@ -1,12 +1,24 @@
 ---
 # SPDX-License-Identifier: Apache-2.0
-# Copyright 2024 The Linux Foundation <abelur@linux.com>
+# SPDX-FileCopyrightText: 2025 The Linux Foundation
 
-name: call-github2gerrit-reusable-workflow
+name: 'GitHub2Gerrit Python'
 
 # yamllint disable-line rule:truthy
 on:
     workflow_dispatch:
+      inputs:
+        preserve_github_prs:
+          description: "Do NOT close GitHub PRs after pushing to Gerrit"
+          required: false
+          default: false
+          type: boolean
+        allow_duplicates:
+          description: "Allow duplicate changes to be raised in Gerrit"
+          required: false
+          default: false
+          type: boolean
+
     pull_request_target:
         types: [opened, reopened, edited, synchronize]
         branches:
@@ -14,21 +26,20 @@ on:
             - main
 
 concurrency:
-    # yamllint disable-line rule:line-length
-    group: ${{ github.workflow }}-${{ github.run_id }}
+    group: "${{ github.workflow }}-${{ github.run_id }}"
     cancel-in-progress: true
 
 jobs:
-    call-in-g2g-workflow:
+    github2gerrit:
         permissions:
             contents: read
             pull-requests: write
-        uses: lfit/github2gerrit/.github/workflows/github2gerrit.yaml@main
+        # yamllint disable rule:line-length
+        uses: modeseven-lfreleng-actions/github2gerrit/.github/workflows/github2gerrit.yaml@main
         with:
-            GERRIT_KNOWN_HOSTS: ${{ vars.GERRIT_KNOWN_HOSTS }}
-            GERRIT_SSH_USER_G2G: ${{ vars.GERRIT_SSH_USER_G2G }}
-            GERRIT_SSH_USER_G2G_EMAIL: ${{ vars.GERRIT_SSH_USER_G2G_EMAIL }}
-            ORGANIZATION: ${{ vars.ORGANIZATION }}
             USE_PR_AS_COMMIT: true
+            ISSUE_ID: "CIMAN-33"
+            ALLOW_DUPLICATES: "${{ inputs.allow_duplicates }}"
+            PRESERVE_GITHUB_PRS: "${{ inputs.preserve_github_prs }}"
         secrets:
-            GERRIT_SSH_PRIVKEY_G2G: ${{ secrets.GERRIT_SSH_PRIVKEY_G2G }}
+            GERRIT_SSH_PRIVKEY_G2G: "${{ secrets.GERRIT_SSH_PRIVKEY_G2G }}"