From 1bb39bc9fd2d25ab195704f1f0ce35a28d28ee73 Mon Sep 17 00:00:00 2001
From: Luke Powlett <luke.powlett@ibm.com>
Date: Mon, 30 Mar 2020 09:27:32 +0100
Subject: [PATCH] Re-enable multi-arch dev build/release

---
 .travis.yml                     | 34 ++++++++++++++++-----------------
 travis-build-scripts/release.sh | 30 ++++++++++++++---------------
 2 files changed, 31 insertions(+), 33 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 73587a7..db6691e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -51,23 +51,23 @@ jobs:
         - MQ_ARCHIVE_REPOSITORY=$MQ_915_ARCHIVE_REPOSITORY_AMD64
         - MQ_ARCHIVE_REPOSITORY_DEV=$MQ_915_ARCHIVE_REPOSITORY_DEV_AMD64
       script: bash -e travis-build-scripts/run.sh
-    # - if: branch = private-master OR tag =~ ^pre-release*
-    #   name: "Multi-Arch PPC64LE build"
-    #   os: linux-ppc64le
-    #   env:
-    #     - BUILD_ALL=true
-    #     - TEST_OPTS_DOCKER="-run TestGoldenPathWithMetrics"
-    #     # - MQ_ARCHIVE_REPOSITORY=$MQ_915_ARCHIVE_REPOSITORY_PPC64LE
-    #     - MQ_ARCHIVE_REPOSITORY_DEV=$MQ_915_ARCHIVE_REPOSITORY_DEV_PPC64LE
-    #   script: bash -e travis-build-scripts/run.sh
-    # - if: branch = private-master OR tag =~ ^pre-release*
-    #   name: "Multi-Arch S390X build"
-    #   os: linux-s390
-    #   env:
-    #     - BUILD_ALL=true
-    #     - TEST_OPTS_DOCKER="-run TestGoldenPathWithMetrics"
-    #     # - MQ_ARCHIVE_REPOSITORY=$MQ_915_ARCHIVE_REPOSITORY_S390X
-    #     - MQ_ARCHIVE_REPOSITORY_DEV=$MQ_915_ARCHIVE_REPOSITORY_DEV_S390X
+    - if: branch = private-master OR tag =~ ^pre-release*
+      name: "Multi-Arch PPC64LE build"
+      os: linux-ppc64le
+      env:
+        - BUILD_ALL=true
+        - TEST_OPTS_DOCKER="-run TestGoldenPathWithMetrics"
+        # - MQ_ARCHIVE_REPOSITORY=$MQ_915_ARCHIVE_REPOSITORY_PPC64LE
+        - MQ_ARCHIVE_REPOSITORY_DEV=$MQ_915_ARCHIVE_REPOSITORY_DEV_PPC64LE
+      script: bash -e travis-build-scripts/run.sh
+    - if: branch = private-master OR tag =~ ^pre-release*
+      name: "Multi-Arch S390X build"
+      os: linux-s390
+      env:
+        - BUILD_ALL=true
+        - TEST_OPTS_DOCKER="-run TestGoldenPathWithMetrics"
+        # - MQ_ARCHIVE_REPOSITORY=$MQ_915_ARCHIVE_REPOSITORY_S390X
+        - MQ_ARCHIVE_REPOSITORY_DEV=$MQ_915_ARCHIVE_REPOSITORY_DEV_S390X
       script: bash -e travis-build-scripts/run.sh
     - stage: deploy
       name: "Pre-release deploy"
diff --git a/travis-build-scripts/release.sh b/travis-build-scripts/release.sh
index b580bdb..8aa9802 100755
--- a/travis-build-scripts/release.sh
+++ b/travis-build-scripts/release.sh
@@ -36,11 +36,10 @@ else
     exit 1
 fi
 
-## Pull all images from default repository
-## BUILD PRODUCTION ONLY UNTIL DEV AUTH CONFIG COMPLETE
-# ARCH=amd64 make pull-devserver
-# ARCH=ppc64le make pull-devserver
-# ARCH=s390x make pull-devserver
+# Pull all images from default repository
+ARCH=amd64 make pull-devserver
+ARCH=ppc64le make pull-devserver
+ARCH=s390x make pull-devserver
 
 ARCH=amd64 make pull-advancedserver
 # ARCH=ppc64le make pull-advancedserver
@@ -83,23 +82,22 @@ elif [ "$TYPE" = "production" ]; then
     set_staging_registry
 
     ARCH=amd64 make pull-advancedserver
-    # ARCH=ppc64le make pull-advancedserver
-    # ARCH=s390x make pull-advancedserver
+    ARCH=ppc64le make pull-advancedserver
+    ARCH=s390x make pull-advancedserver
 
     # release developer image with fat manifest
     set_docker_hub
 
-    ## BUILD PRODUCTION ONLY UNTIL DEV AUTH CONFIG COMPLETE 
-    # ARCH=amd64 make push-devserver-dockerhub
-    # ARCH=ppc64le make push-devserver-dockerhub
-    # ARCH=s390x make push-devserver-dockerhub
+    ARCH=amd64 make push-devserver-dockerhub
+    ARCH=ppc64le make push-devserver-dockerhub
+    ARCH=s390x make push-devserver-dockerhub
 
-    # curl -LO https://github.com/estesp/manifest-tool/releases/download/v0.9.0/manifest-tool-linux-amd64
-    # chmod a+x manifest-tool-linux-amd64
+    curl -LO https://github.com/estesp/manifest-tool/releases/download/v0.9.0/manifest-tool-linux-amd64
+    chmod a+x manifest-tool-linux-amd64
 
-    # docker login --username $MQ_DOCKERHUB_REGISTRY_USER --password $MQ_DOCKERHUB_REGISTRY_CREDENTIAL
-    # ./manifest-tool-linux-amd64 push from-spec manifests/dockerhub/$MANIFEST_FILE
-    # ./manifest-tool-linux-amd64 push from-spec manifests/dockerhub/manifest-latest.yaml
+    docker login --username $MQ_DOCKERHUB_REGISTRY_USER --password $MQ_DOCKERHUB_REGISTRY_CREDENTIAL
+    ./manifest-tool-linux-amd64 push from-spec manifests/dockerhub/$MANIFEST_FILE
+    ./manifest-tool-linux-amd64 push from-spec manifests/dockerhub/manifest-latest.yaml
 
     # release production image
     set_production_registry