From 490055e74c644e565214385293cd07945a0f6249 Mon Sep 17 00:00:00 2001 From: KIRAN DARBHA Date: Tue, 18 Aug 2020 19:03:54 +0530 Subject: [PATCH] addressing review comments --- .travis.yml | 8 -------- travis-build-scripts/test.sh | 2 +- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6c2104e..0127702 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,14 +43,6 @@ jobs: 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 diff --git a/travis-build-scripts/test.sh b/travis-build-scripts/test.sh index f962799..036bf04 100755 --- a/travis-build-scripts/test.sh +++ b/travis-build-scripts/test.sh @@ -27,7 +27,7 @@ if [ "$BUILD_ALL" = true ] ; then fi fi echo 'Running gosec scan...' && echo -en 'travis_fold:start:gosec-scan\\r' -if [[ "$ARCH" = "amd64" || "$ARCH" = "s390x" ]] ; then +if [ "$ARCH" = "amd64" ] ; then make gosec else echo "Gosec not available on ppc64le/s390x...skipping gosec scan"