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

Merge pull request #101 from mq-cloudpak/zlinux-update

Browse Source 
adding zlinux-support
This commit is contained in:
VENKATA KIRAN KUMAR DARBHA
2020-08-18 20:29:30 +05:30
committed by GitHub Enterprise
parent cd69f6287f 490055e74c
commit 720ecae5bb
4 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
.travis.yml
View File

@@ -36,9 +36,9 @@ 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
@@ -60,15 +60,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'

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

@@ -20,7 +20,7 @@ echo 'Testing Developer image...' && echo -en 'travis_fold:start:test-devserver\
make test-devserver make test-devserver
echo -en 'travis_fold:end:test-devserver\\r' echo -en 'travis_fold:end:test-devserver\\r'
if [ "$BUILD_ALL" = true ] ; then if [ "$BUILD_ALL" = true ] ; then
if [ "$ARCH" = "amd64" ] ; then if [[ "$ARCH" = "amd64" || "$ARCH" = "s390x" ]] ; then
echo 'Testing Production image...' && echo -en 'travis_fold:start:test-advancedserver\\r' echo 'Testing Production image...' && echo -en 'travis_fold:start:test-advancedserver\\r'
make test-advancedserver make test-advancedserver
echo -en 'travis_fold:end:test-advancedserver\\r' echo -en 'travis_fold:end:test-advancedserver\\r'