From 8d7085c18fbee6be9122e2a083a7c2fe47e0af8b Mon Sep 17 00:00:00 2001
From: KIRAN DARBHA <kirandarbha@in.ibm.com>
Date: Tue, 18 Aug 2020 16:49:01 +0530
Subject: [PATCH] adding zlinux-support

---
 .travis.yml                   | 30 +++++++++++++++++++-----------
 travis-build-scripts/build.sh |  2 +-
 travis-build-scripts/push.sh  |  2 +-
 3 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a534e91..6c2104e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -36,13 +36,21 @@ env:
 
 jobs:
   include:
-    - stage: build
-      name: "Basic build"
+    - stage: build-amd64
       if: branch != private-master AND tag IS blank
+      name: "Basic AMD64 build"
       os: linux
       env:
         - MQ_ARCHIVE_REPOSITORY_DEV=$MQ_920_ARCHIVE_REPOSITORY_DEV_AMD64
       script: bash -e travis-build-scripts/run.sh
+    - stage: build-s390x
+      if: branch != private-master AND tag IS blank
+      name: "Basic S390X build"
+      os: linux-s390
+      env:
+        - TEST_OPTS_DOCKER="-run TestGoldenPathWithMetrics"
+        - MQ_ARCHIVE_REPOSITORY_DEV=$MQ_920_ARCHIVE_REPOSITORY_DEV_S390X
+      script: travis_wait 60 bash -e travis-build-scripts/run.sh
     - if: branch = private-master OR tag =~ ^release-candidate*
       name: "Multi-Arch AMD64 build"
       os: linux
@@ -60,15 +68,15 @@ jobs:
     #     # - MQ_ARCHIVE_REPOSITORY=$MQ_920_ARCHIVE_REPOSITORY_PPC64LE
     #     - MQ_ARCHIVE_REPOSITORY_DEV=$MQ_920_ARCHIVE_REPOSITORY_DEV_PPC64LE
     #   script: bash -e travis-build-scripts/run.sh
-    # - if: branch = private-master OR tag =~ ^release-candidate*
-    #   name: "Multi-Arch S390X build"
-    #   os: linux-s390
-    #   env:
-    #     - BUILD_ALL=true
-    #     - TEST_OPTS_DOCKER="-run TestGoldenPathWithMetrics"
-    #     # - MQ_ARCHIVE_REPOSITORY=$MQ_920_ARCHIVE_REPOSITORY_S390X
-    #     - MQ_ARCHIVE_REPOSITORY_DEV=$MQ_920_ARCHIVE_REPOSITORY_DEV_S390X
-    #   script: bash -e travis-build-scripts/run.sh
+    - if: branch = private-master OR tag =~ ^release-candidate*
+      name: "Multi-Arch S390X build"
+      os: linux-s390
+      env:
+        - BUILD_ALL=true
+        - TEST_OPTS_DOCKER="-run TestGoldenPathWithMetrics"
+        - MQ_ARCHIVE_REPOSITORY=$MQ_920_ARCHIVE_REPOSITORY_S390X
+        - MQ_ARCHIVE_REPOSITORY_DEV=$MQ_920_ARCHIVE_REPOSITORY_DEV_S390X
+      script: bash -e travis-build-scripts/run.sh
 
 before_install:
   - make install-build-deps
diff --git a/travis-build-scripts/build.sh b/travis-build-scripts/build.sh
index c9fae5a..cd634fd 100755
--- a/travis-build-scripts/build.sh
+++ b/travis-build-scripts/build.sh
@@ -23,7 +23,7 @@ echo 'Building Developer image...' && echo -en 'travis_fold:start:build-devserve
 make build-devserver
 echo -en 'travis_fold:end:build-devserver\\r'
 if [ "$BUILD_ALL" = true ] ; then
-    if [ "$ARCH" = "amd64" ] ; then
+    if [[ "$ARCH" = "amd64" || "$ARCH" = "s390x" ]] ; then
         echo 'Building Production image...' && echo -en 'travis_fold:start:build-advancedserver\\r'
         make build-advancedserver
         echo -en 'travis_fold:end:build-advancedserver\\r'
diff --git a/travis-build-scripts/push.sh b/travis-build-scripts/push.sh
index 55154bb..5165cc2 100755
--- a/travis-build-scripts/push.sh
+++ b/travis-build-scripts/push.sh
@@ -32,7 +32,7 @@ function push_developer {
 }
 
 function push_production {
-    if [ "$ARCH" = "amd64" ] ; then
+    if [[ "$ARCH" = "amd64" || "$ARCH" = "s390x" ]] ; then
         echo 'Pushing Production image...' && echo -en 'travis_fold:start:push-advancedserver\\r'
         make push-advancedserver
         echo -en 'travis_fold:end:push-advancedserver\\r'