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

adding zlinux-support

Browse Source
This commit is contained in:
KIRAN DARBHA
2020-08-18 16:49:01 +05:30
committed by LPowlett
parent 7a1d39e303
commit 666b23e7f0
3 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
.travis.yml
View File

@@ -36,13 +36,21 @@ env:
jobs: jobs:
include: include:
- stage: build - stage: build-amd64
name: "Basic build"
if: branch != private-master AND tag IS blank if: branch != private-master AND tag IS blank
name: "Basic AMD64 build"
os: linux os: linux
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
@@ -60,15 +68,15 @@ jobs:
# # - MQ_ARCHIVE_REPOSITORY=$MQ_920_ARCHIVE_REPOSITORY_PPC64LE # # - MQ_ARCHIVE_REPOSITORY=$MQ_920_ARCHIVE_REPOSITORY_PPC64LE
# - MQ_ARCHIVE_REPOSITORY_DEV=$MQ_920_ARCHIVE_REPOSITORY_DEV_PPC64LE # - MQ_ARCHIVE_REPOSITORY_DEV=$MQ_920_ARCHIVE_REPOSITORY_DEV_PPC64LE
# script: bash -e travis-build-scripts/run.sh # script: 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 S390X build" name: "Multi-Arch S390X build"
# os: linux-s390 os: linux-s390
# env: env:
# - BUILD_ALL=true - BUILD_ALL=true
# - TEST_OPTS_DOCKER="-run TestGoldenPathWithMetrics" - TEST_OPTS_DOCKER="-run TestGoldenPathWithMetrics"
# # - MQ_ARCHIVE_REPOSITORY=$MQ_920_ARCHIVE_REPOSITORY_S390X - MQ_ARCHIVE_REPOSITORY=$MQ_920_ARCHIVE_REPOSITORY_S390X
# - MQ_ARCHIVE_REPOSITORY_DEV=$MQ_920_ARCHIVE_REPOSITORY_DEV_S390X - MQ_ARCHIVE_REPOSITORY_DEV=$MQ_920_ARCHIVE_REPOSITORY_DEV_S390X
# script: bash -e travis-build-scripts/run.sh script: bash -e travis-build-scripts/run.sh
before_install: before_install:
- make install-build-deps - make install-build-deps

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

@@ -23,7 +23,7 @@ echo 'Building Developer image...' && echo -en 'travis_fold:start:build-devserve
make build-devserver make build-devserver
echo -en 'travis_fold:end:build-devserver\\r' echo -en 'travis_fold:end:build-devserver\\r'
if [ "$BUILD_ALL" = true ] ; then 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' echo 'Building Production image...' && echo -en 'travis_fold:start:build-advancedserver\\r'
make build-advancedserver make build-advancedserver
echo -en 'travis_fold:end:build-advancedserver\\r' echo -en 'travis_fold:end:build-advancedserver\\r'

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

@@ -32,7 +32,7 @@ function push_developer {
} }
function push_production { 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' echo 'Pushing Production image...' && echo -en 'travis_fold:start:push-advancedserver\\r'
make push-advancedserver make push-advancedserver
echo -en 'travis_fold:end:push-advancedserver\\r' echo -en 'travis_fold:end:push-advancedserver\\r'