academy/mq-container
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

addressing review comments

Browse Source
This commit is contained in:
KIRAN DARBHA
2020-08-18 19:03:54 +05:30
committed by LPowlett
parent 7c89606782
commit fda918db20
2 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.travis.yml
View File

@@ -43,14 +43,6 @@ jobs:
env: env:
- MQ_ARCHIVE_REPOSITORY_DEV=$MQ_920_ARCHIVE_REPOSITORY_DEV_AMD64 - MQ_ARCHIVE_REPOSITORY_DEV=$MQ_920_ARCHIVE_REPOSITORY_DEV_AMD64
script: bash -e travis-build-scripts/run.sh 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* - if: branch = private-master OR tag =~ ^release-candidate*
name: "Multi-Arch AMD64 build" name: "Multi-Arch AMD64 build"
os: linux os: linux

2
travis-build-scripts/test.sh
View File

@@ -27,7 +27,7 @@ if [ "$BUILD_ALL" = true ] ; then
fi fi
fi fi
echo 'Running gosec scan...' && echo -en 'travis_fold:start:gosec-scan\\r' echo 'Running gosec scan...' && echo -en 'travis_fold:start:gosec-scan\\r'
if [[ "$ARCH" = "amd64" || "$ARCH" = "s390x" ]] ; then if [ "$ARCH" = "amd64" ] ; then
make gosec make gosec
else else
echo "Gosec not available on ppc64le/s390x...skipping gosec scan" echo "Gosec not available on ppc64le/s390x...skipping gosec scan"