From bc3163f4b6a8ac4526cce69f9f713ccdc1e9343d Mon Sep 17 00:00:00 2001
From: halim-lee <halim.lee@ibm.com>
Date: Fri, 28 Jan 2022 11:48:28 -0500
Subject: [PATCH] Build and push p and z-linux images to Docker Hub

---
 .travis.yml                   | 22 +++++++++++-----------
 scripts/build-manifest.sh     | 22 +++++++++++++++++-----
 scripts/release-blocklist.txt |  4 +++-
 3 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f059b6b44..9f02be9a8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,7 +27,7 @@ stages:
   - name: rebuild-e2e-test
     if: branch = main AND fork = false AND type = cron
   - name: rebuild-releases
-    if: branch = main AND fork = false AND type = cron
+    if: (branch = main OR tag =~ ^v) AND fork = false AND type != cron
   - name: rebuild-bundles
     if: branch = main AND fork = false AND type = cron
 
@@ -76,16 +76,16 @@ jobs:
       os: linux
       arch: amd64
       script: travis_wait 45 make setup test-e2e RELEASE_TARGET="releases" || travis_terminate 1
-    # - name: Build releases on ppc64le
-    #   stage: rebuild-releases
-    #   os: linux
-    #   arch: ppc64le
-    #   script: make build-releases RELEASE_TARGET="releases"
-    # - name: Build releases on s390x
-    #   stage: rebuild-releases
-    #   os: linux
-    #   arch: s390x
-    #   script: make build-releases RELEASE_TARGET="releases"
+    - name: Build releases on ppc64le
+      stage: rebuild-releases
+      os: linux
+      arch: ppc64le
+      script: make build-releases RELEASE_TARGET="releases" && make build-manifest RELEASE_TARGET="releases"
+    - name: Build releases on s390x
+      stage: rebuild-releases
+      os: linux
+      arch: s390x
+      script: make build-releases RELEASE_TARGET="releases" && make build-manifest RELEASE_TARGET="releases"
     - name: Build releases on amd64
       stage: rebuild-releases
       os: linux
diff --git a/scripts/build-manifest.sh b/scripts/build-manifest.sh
index 23bd87b95..b52b8fbd6 100755
--- a/scripts/build-manifest.sh
+++ b/scripts/build-manifest.sh
@@ -60,14 +60,26 @@ build_manifest() {
   local tag="$1"
   echo "****** Building manifest for: ${tag}"
 
+  ## Define current arch variable
+  case "$(uname -p)" in
+  "ppc64le")
+    readonly arch="ppc64le"
+    ;;
+  "s390x")
+    readonly arch="s390x"
+    ;;
+  *)
+    readonly arch="amd64"
+    ;;
+  esac
+
   ## try to build manifest but allow failure
   ## this allows new release builds
-  local target="${IMAGE}:${tag}"
-  # TODO: Add back in linux/s390x and linux/ppc64le once build platforms are back up
-  # --platforms "linux/amd64,linux/s390x,linux/ppc64le" \
+  local target="${IMAGE}:${tag}-${arch}"
+
   manifest-tool push from-args \
-    --platforms "linux/amd64" \
-    --template "${target}-ARCH" \
+    --platforms "linux/${arch}" \
+    --template "${target}" \
     --target "${target}" \
     || echo "*** WARN: Target architectures not available"
 }
diff --git a/scripts/release-blocklist.txt b/scripts/release-blocklist.txt
index f278bb0da..dd8c30683 100644
--- a/scripts/release-blocklist.txt
+++ b/scripts/release-blocklist.txt
@@ -8,4 +8,6 @@ v0.5.1
 v0.6.0
 v0.7.0
 v0.7.1
-
+v0.8.0
+v0.8.0-20211124-1750
+v0.8.0-rc.1