[TD-196] Commits to rel-eng on master sync'd to release-3.2 (TykTechn…

…ologies#3500) Commit directly to release heads for older branches. This PR also adds the tagging and pushing of ancillary docker images (plugin compiler and hybrid) for -rc tags. This will complete the release engineering automation for tyk.
osref · Mar 22, 2021 · abea9fe · abea9fe
1 parent 84ff3a4
commit abea9fe
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 17 deletions.
diff --git a/.github/workflows/del-env.yml b/.github/workflows/del-env.yml
@@ -1,8 +1,8 @@
 # Generated by: tyk-ci/wf-gen
-# Generated on: Wednesday 17 March 2021 01:11:52 PM UTC
+# Generated on: Mon 22 Mar 05:04:49 UTC 2021
 
 # Generation commands:
-# ./pr.zsh -branch goreleaser/fixes -title rel-eng: osx tarballs and other fixes
+# ./pr.zsh -title Push ancillary docker images -branch releng/sync -base releng/sync -repos tyk -p
 # m4 -E -DxREPO=tyk
 
 name: Retiring dev env

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -1,8 +1,8 @@
 # Generated by: tyk-ci/wf-gen
-# Generated on: Wednesday 17 March 2021 01:11:52 PM UTC
+# Generated on: Mon 22 Mar 05:04:49 UTC 2021
 
 # Generation commands:
-# ./pr.zsh -branch goreleaser/fixes -title rel-eng: osx tarballs and other fixes
+# ./pr.zsh -title Push ancillary docker images -branch releng/sync -base releng/sync -repos tyk -p
 # m4 -E -DxREPO=tyk
 
 # Distribution channels covered by this workflow
@@ -176,9 +176,15 @@ jobs:
       - name: Push unstable docker image
         if: steps.targets.outputs.hub == 'unstable' && steps.targets.outputs.upload == 'true'
         run: |
+          tag=${GITHUB_REF##*/}
           docker tag tykio/tyk-gateway tykio/tyk-gateway:${{ steps.targets.outputs.hub }}
-          docker tag tykio/tyk-gateway tykio/tyk-gateway:${GITHUB_REF##*/}
+          docker tag tykio/tyk-gateway tykio/tyk-gateway:${tag}
           docker push --all-tags tykio/tyk-gateway
+          docker tag tykio/tyk-plugin-compiler tykio/tyk-plugin-compiler:${tag}
+          docker push tykio/tyk-plugin-compiler:${tag}
+          docker tag tykio/tyk-hybrid-docker tykio/tyk-hybrid-docker:${tag}
+          docker push tykio/tyk-hybrid-docker:${tag}
+
 
 # AWS mktplace update only for LTS releases
   aws-mktplace-byol:

diff --git a/.github/workflows/sync-automation.yml b/.github/workflows/sync-automation.yml
@@ -29,7 +29,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        branch: [ release-3, release-3-lts, release-3.2 ]
+        branch: [ release-3.2 ]
 
     steps:
       - uses: actions/checkout@v2
@@ -44,6 +44,6 @@ jobs:
           for f in $FILES; do 
             git checkout --theirs origin/master -- $f || true
           done
-          git commit -a -m "[CI] Syncing automation from master"
+          git commit -a -m "[CI] Syncing release automation from master"
           git push origin
           echo "::warning::${FILES} syncd for ${{matrix.branch}}"
diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -1,8 +1,8 @@
 # Generated by: tyk-ci/wf-gen
-# Generated on: Wednesday 17 March 2021 01:11:52 PM UTC
+# Generated on: Mon 22 Mar 05:04:49 UTC 2021
 
 # Generation commands:
-# ./pr.zsh -branch goreleaser/fixes -title rel-eng: osx tarballs and other fixes
+# ./pr.zsh -title Push ancillary docker images -branch releng/sync -base releng/sync -repos tyk -p
 # m4 -E -DxREPO=tyk
 
 

diff --git a/Dockerfile.slim b/Dockerfile.slim
@@ -1,8 +1,8 @@
 # Generated by: tyk-ci/wf-gen
-# Generated on: Wednesday 17 March 2021 01:11:52 PM UTC
+# Generated on: Mon 22 Mar 05:04:49 UTC 2021
 
 # Generation commands:
-# ./pr.zsh -branch goreleaser/fixes -title rel-eng: osx tarballs and other fixes
+# ./pr.zsh -title Push ancillary docker images -branch releng/sync -base releng/sync -repos tyk -p
 # m4 -E -DxREPO=tyk
 
 FROM gcr.io/distroless/static-debian10

diff --git a/Dockerfile.std b/Dockerfile.std
@@ -1,8 +1,8 @@
 # Generated by: tyk-ci/wf-gen
-# Generated on: Wednesday 17 March 2021 01:11:52 PM UTC
+# Generated on: Mon 22 Mar 05:04:49 UTC 2021
 
 # Generation commands:
-# ./pr.zsh -branch goreleaser/fixes -title rel-eng: osx tarballs and other fixes
+# ./pr.zsh -title Push ancillary docker images -branch releng/sync -base releng/sync -repos tyk -p
 # m4 -E -DxREPO=tyk
 
 FROM debian:buster-slim

diff --git a/aws/byol.pkr.hcl b/aws/byol.pkr.hcl
@@ -1,8 +1,8 @@
 # Generated by: tyk-ci/wf-gen
-# Generated on: Wednesday 17 March 2021 01:11:52 PM UTC
+# Generated on: Mon 22 Mar 05:04:49 UTC 2021
 
 # Generation commands:
-# ./pr.zsh -branch goreleaser/fixes -title rel-eng: osx tarballs and other fixes
+# ./pr.zsh -title Push ancillary docker images -branch releng/sync -base releng/sync -repos tyk -p
 # m4 -E -DxREPO=tyk
 
 variable "aws_access_key" {

diff --git a/integration/terraform/outputs.tf b/integration/terraform/outputs.tf
@@ -1,8 +1,8 @@
 # Generated by: tyk-ci/wf-gen
-# Generated on: Wednesday 17 March 2021 01:11:52 PM UTC
+# Generated on: Mon 22 Mar 05:04:49 UTC 2021
 
 # Generation commands:
-# ./pr.zsh -branch goreleaser/fixes -title rel-eng: osx tarballs and other fixes
+# ./pr.zsh -title Push ancillary docker images -branch releng/sync -base releng/sync -repos tyk -p
 # m4 -E -DxREPO=tyk