images to patch sourced from json file (#6326)

nginx · Sep 3, 2024 · 802888a · 802888a
1 parent fbeed76
commit 802888a
Show file tree

Hide file tree

Showing 7 changed files with 176 additions and 141 deletions.
diff --git a/.github/data/patch-images.json b/.github/data/patch-images.json
@@ -0,0 +1,110 @@
+[
+  {
+    "source_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic/nginx-ingress",
+    "source_os": "debian",
+    "target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic/nginx-ingress",
+    "platforms": "linux/arm, linux/arm64, linux/amd64, linux/ppc64le, linux/s390x"
+  },
+  {
+    "source_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic/nginx-ingress",
+    "source_os": "alpine",
+    "target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic/nginx-ingress",
+    "platforms": "linux/arm, linux/arm64, linux/amd64, linux/ppc64le, linux/s390x"
+  },
+  {
+    "source_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic/nginx-ingress",
+    "source_os": "ubi",
+    "target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic/nginx-ingress",
+    "platforms": "linux/arm64, linux/amd64, linux/ppc64le, linux/s390x"
+  },
+  {
+    "source_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic/nginx-plus-ingress",
+    "source_os": "debian",
+    "target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic/nginx-plus-ingress",
+    "platforms": "linux/arm64, linux/amd64"
+  },
+  {
+    "source_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic/nginx-plus-ingress",
+    "source_os": "mktpl",
+    "target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic/nginx-plus-ingress",
+    "platforms": "linux/arm64, linux/amd64"
+  },
+  {
+    "source_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic/nginx-plus-ingress",
+    "source_os": "alpine",
+    "target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic/nginx-plus-ingress",
+    "platforms": "linux/arm64, linux/amd64"
+  },
+  {
+    "source_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic/nginx-plus-ingress",
+    "source_os": "ubi",
+    "target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic/nginx-plus-ingress",
+    "platforms": "linux/arm64, linux/amd64"
+  },
+  {
+    "source_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic-nap/nginx-plus-ingress",
+    "source_os": "debian",
+    "target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic-nap/nginx-plus-ingress",
+    "platforms": "linux/amd64"
+  },
+  {
+    "source_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic-nap/nginx-plus-ingress",
+    "source_os": "mktpl",
+    "target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic-nap/nginx-plus-ingress",
+    "platforms": "linux/amd64"
+  },
+  {
+    "source_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic-nap/nginx-plus-ingress",
+    "source_os": "ubi",
+    "target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic-nap/nginx-plus-ingress",
+    "platforms": "linux/amd64"
+  },
+  {
+    "source_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic-nap-v5/nginx-plus-ingress",
+    "source_os": "debian",
+    "target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic-nap-v5/nginx-plus-ingress",
+    "platforms": "linux/amd64"
+  },
+  {
+    "source_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic-nap-v5/nginx-plus-ingress",
+    "source_os": "ubi",
+    "target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic-nap-v5/nginx-plus-ingress",
+    "platforms": "linux/amd64"
+  },
+  {
+    "source_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic-dos/nginx-plus-ingress",
+    "source_os": "debian",
+    "target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic-dos/nginx-plus-ingress",
+    "platforms": "linux/amd64"
+  },
+  {
+    "source_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic-dos/nginx-plus-ingress",
+    "source_os": "mktpl",
+    "target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic-dos/nginx-plus-ingress",
+    "platforms": "linux/amd64"
+  },
+  {
+    "source_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic-dos/nginx-plus-ingress",
+    "source_os": "ubi",
+    "target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic-dos/nginx-plus-ingress",
+    "platforms": "linux/amd64"
+  },
+  {
+    "source_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic-dos-nap/nginx-plus-ingress",
+    "source_os": "debian",
+    "target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic-dos-nap/nginx-plus-ingress",
+    "platforms": "linux/amd64"
+  },
+  {
+    "source_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic-dos-nap/nginx-plus-ingress",
+    "source_os": "mktpl",
+    "target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic-dos-nap/nginx-plus-ingress",
+    "platforms": "linux/amd64"
+  },
+  {
+    "source_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic-dos-nap/nginx-plus-ingress",
+    "source_os": "ubi",
+    "target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic-dos-nap/nginx-plus-ingress",
+    "platforms": "linux/amd64"
+  }
+]
diff --git a/.github/workflows/image-promotion.yml b/.github/workflows/image-promotion.yml
@@ -321,6 +321,7 @@ jobs:
       github_public_registry: true
       source_tag: ${{ needs.checks.outputs.stable_tag }}
       target_tag: "edge"
+      branch: ${{ github.ref_name }}
       dry_run: false
     permissions:
       contents: read
@@ -342,6 +343,7 @@ jobs:
       az_mktpl_registry: false
       source_tag: ${{ needs.checks.outputs.stable_tag }}
       target_tag: "edge"
+      branch: ${{ github.ref_name }}
       dry_run: false
     permissions:
       contents: read

diff --git a/.github/workflows/oss-release.yml b/.github/workflows/oss-release.yml
@@ -24,6 +24,10 @@ on:
       target_tag:
         required: true
         type: string
+      branch:
+        required: false
+        type: string
+        default: "main"
       dry_run:
         type: boolean
         default: false
@@ -50,6 +54,10 @@ on:
       target_tag:
         required: true
         type: string
+      branch:
+        required: false
+        type: string
+        default: "main"
       dry_run:
         type: boolean
         default: false
@@ -72,6 +80,8 @@ jobs:
     steps:
       - name: Checkout Repository
         uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+        with:
+          ref: ${{ inputs.branch }}
 
       - name: Authenticate to Google Cloud
         id: gcr-auth
@@ -108,6 +118,8 @@ jobs:
     steps:
       - name: Checkout Repository
         uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+        with:
+          ref: ${{ inputs.branch }}
 
       - name: Authenticate to Google Cloud
         id: gcr-auth
@@ -155,6 +167,8 @@ jobs:
     steps:
       - name: Checkout Repository
         uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+        with:
+          ref: ${{ inputs.branch }}
 
       - name: Authenticate to Google Cloud
         id: gcr-auth
@@ -197,6 +211,8 @@ jobs:
     steps:
       - name: Checkout Repository
         uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+        with:
+          ref: ${{ inputs.branch }}
 
       - name: Authenticate to Google Cloud
         id: gcr-auth
@@ -241,6 +257,8 @@ jobs:
     steps:
       - name: Checkout Repository
         uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+        with:
+          ref: ${{ inputs.branch }}
 
       - name: Authenticate to Google Cloud
         id: gcr-auth

diff --git a/.github/workflows/plus-release.yml b/.github/workflows/plus-release.yml
@@ -24,6 +24,10 @@ on:
       target_tag:
         required: true
         type: string
+      branch:
+        required: false
+        type: string
+        default: "main"
       dry_run:
         type: boolean
         default: false
@@ -50,6 +54,10 @@ on:
       target_tag:
         required: true
         type: string
+      branch:
+        required: false
+        type: string
+        default: "main"
       dry_run:
         type: boolean
         default: false
@@ -72,6 +80,8 @@ jobs:
     steps:
       - name: Checkout Repository
         uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+        with:
+          ref: ${{ inputs.branch }}
 
       - name: Authenticate to Google Cloud
         id: gcr-auth
@@ -108,6 +118,8 @@ jobs:
     steps:
       - name: Checkout Repository
         uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+        with:
+          ref: ${{ inputs.branch }}
 
       - name: Authenticate to Google Cloud
         id: gcr-auth
@@ -159,6 +171,8 @@ jobs:
     steps:
       - name: Checkout Repository
         uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+        with:
+          ref: ${{ inputs.branch }}
 
       - name: Authenticate to Google Cloud
         id: gcr-priv-auth
@@ -198,6 +212,8 @@ jobs:
     steps:
       - name: Checkout Repository
         uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+        with:
+          ref: ${{ inputs.branch }}
 
       - name: Authenticate to Google Cloud
         id: gcr-auth
@@ -245,6 +261,8 @@ jobs:
     steps:
       - name: Checkout Repository
         uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+        with:
+          ref: ${{ inputs.branch }}
 
       - name: Authenticate to Google Cloud
         id: gcr-auth

diff --git a/.github/workflows/regression.yml b/.github/workflows/regression.yml
@@ -83,9 +83,12 @@ jobs:
   unit-tests:
     name: Unit Tests
     runs-on: ubuntu-24.04
+    needs: [checks]
     steps:
       - name: Checkout Repository
         uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+        with:
+          ref: ${{ needs.checks.outputs.branch }}
 
       - name: Setup Golang Environment
         uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
@@ -302,6 +305,7 @@ jobs:
       quay_public_registry: true
       github_public_registry: true
       source_tag: ${{ needs.checks.outputs.stable_tag }}
+      branch: ${{ needs.checks.outputs.branch }}
       target_tag: "nightly"
       dry_run: false
     permissions:
@@ -323,6 +327,7 @@ jobs:
       az_mktpl_registry: false
       source_tag: ${{ needs.checks.outputs.stable_tag }}
       target_tag: "nightly"
+      branch: ${{ needs.checks.outputs.branch }}
       dry_run: false
     permissions:
       contents: read

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -154,6 +154,7 @@ jobs:
       github_public_registry: true
       source_tag: ${{ needs.variables.outputs.source_tag }}
       target_tag: ${{ matrix.tag }}
+      branch: ${{ inputs.release_branch }}
       dry_run: ${{ inputs.dry_run }}
     permissions:
       contents: read
@@ -182,6 +183,7 @@ jobs:
       az_mktpl_registry: false
       source_tag: ${{ needs.variables.outputs.source_tag }}
       target_tag: ${{ inputs.nic_version }}
+      branch: ${{ inputs.release_branch }}
       dry_run: ${{ inputs.dry_run }}
     permissions:
       contents: read
@@ -208,6 +210,7 @@ jobs:
       az_mktpl_registry: false
       source_tag: ${{ needs.variables.outputs.source_tag }}
       target_tag: ${{ inputs.nic_version }}
+      branch: ${{ inputs.release_branch }}
       dry_run: ${{ inputs.dry_run }}
     permissions:
       contents: read
@@ -233,6 +236,7 @@ jobs:
       az_mktpl_registry: false
       source_tag: ${{ needs.variables.outputs.source_tag }}
       target_tag: ${{ inputs.nic_version }}
+      branch: ${{ inputs.release_branch }}
       dry_run: ${{ inputs.dry_run }}
     permissions:
       contents: read
@@ -258,6 +262,7 @@ jobs:
       az_mktpl_registry: true
       source_tag: ${{ needs.variables.outputs.source_tag }}
       target_tag: ${{ inputs.nic_version }}
+      branch: ${{ inputs.release_branch }}
       dry_run: ${{ inputs.dry_run }}
     permissions:
       contents: read