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

Only build/release P/Z platforms for developer image

Browse Source
This commit is contained in:
Luke J Powlett
2020-03-17 12:08:28 +00:00
parent c1cbb62ee1
commit d9c8fc5c78
8 changed files with 63 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@@ -57,7 +57,7 @@ jobs:
env: env:
- BUILD_ALL=true - BUILD_ALL=true
- TEST_OPTS_DOCKER="-run TestGoldenPathWithMetrics" - TEST_OPTS_DOCKER="-run TestGoldenPathWithMetrics"
- MQ_ARCHIVE_REPOSITORY=$MQ_915_ARCHIVE_REPOSITORY_PPC64LE # - MQ_ARCHIVE_REPOSITORY=$MQ_915_ARCHIVE_REPOSITORY_PPC64LE
- MQ_ARCHIVE_REPOSITORY_DEV=$MQ_915_ARCHIVE_REPOSITORY_DEV_PPC64LE - MQ_ARCHIVE_REPOSITORY_DEV=$MQ_915_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 =~ ^pre-release* - if: branch = private-master OR tag =~ ^pre-release*
@@ -66,7 +66,7 @@ jobs:
env: env:
- BUILD_ALL=true - BUILD_ALL=true
- TEST_OPTS_DOCKER="-run TestGoldenPathWithMetrics" - TEST_OPTS_DOCKER="-run TestGoldenPathWithMetrics"
- MQ_ARCHIVE_REPOSITORY=$MQ_915_ARCHIVE_REPOSITORY_S390X # - MQ_ARCHIVE_REPOSITORY=$MQ_915_ARCHIVE_REPOSITORY_S390X
- MQ_ARCHIVE_REPOSITORY_DEV=$MQ_915_ARCHIVE_REPOSITORY_DEV_S390X - MQ_ARCHIVE_REPOSITORY_DEV=$MQ_915_ARCHIVE_REPOSITORY_DEV_S390X
script: bash -e travis-build-scripts/run.sh script: bash -e travis-build-scripts/run.sh
- stage: deploy - stage: deploy

28
manifests/dockerhub/manifest-9.1.5.yaml Normal file
View File

@@ -0,0 +1,28 @@
# © Copyright IBM Corporation 2020
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
image: ibmcom/mq:9.1.5.0-r1
manifests:
- image: ibmcom/mq:9.1.5.0-r1-amd64
platform:
architecture: amd64
os: linux
- image: ibmcom/mq:9.1.5.0-r1-ppc64le
platform:
architecture: ppc64le
os: linux
- image: ibmcom/mq:9.1.5.0-r1-s390x
platform:
architecture: s390x
os: linux

8
manifests/dockerhub/manifest-latest.yaml
View File

@@ -1,4 +1,4 @@
# © Copyright IBM Corporation 2018, 2019 # © Copyright IBM Corporation 2018, 2020
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
@@ -14,15 +14,15 @@
image: ibmcom/mq:latest image: ibmcom/mq:latest
manifests: manifests:
- image: ibmcom/mq:9.1.4.0-r1-amd64 - image: ibmcom/mq:9.1.5.0-r1-amd64
platform: platform:
architecture: amd64 architecture: amd64
os: linux os: linux
- image: ibmcom/mq:9.1.4.0-r1-ppc64le - image: ibmcom/mq:9.1.5.0-r1-ppc64le
platform: platform:
architecture: ppc64le architecture: ppc64le
os: linux os: linux
- image: ibmcom/mq:9.1.4.0-r1-s390x - image: ibmcom/mq:9.1.5.0-r1-s390x
platform: platform:
architecture: s390x architecture: s390x
os: linux os: linux

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

@@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
# © Copyright IBM Corporation 2019 # © Copyright IBM Corporation 2019, 2020
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
@@ -23,7 +23,9 @@ 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
echo 'Building Production image...' && echo -en 'travis_fold:start:build-advancedserver\\r' if [ "$ARCH" = "amd64" ] ; then
make build-advancedserver echo 'Building Production image...' && echo -en 'travis_fold:start:build-advancedserver\\r'
echo -en 'travis_fold:end:build-advancedserver\\r' make build-advancedserver
echo -en 'travis_fold:end:build-advancedserver\\r'
fi
fi fi

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

@@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
# © Copyright IBM Corporation 2019 # © Copyright IBM Corporation 2019, 2020
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
@@ -32,9 +32,11 @@ function push_developer {
} }
function push_production { function push_production {
echo 'Pushing Production image...' && echo -en 'travis_fold:start:push-advancedserver\\r' if [ "$ARCH" = "amd64" ] ; then
make push-advancedserver echo 'Pushing Production image...' && echo -en 'travis_fold:start:push-advancedserver\\r'
echo -en 'travis_fold:end:push-advancedserver\\r' make push-advancedserver
echo -en 'travis_fold:end:push-advancedserver\\r'
fi
} }
# call relevant push function # call relevant push function

20
travis-build-scripts/release.sh
View File

@@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
# © Copyright IBM Corporation 2019 # © Copyright IBM Corporation 2019, 2020
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@ set -e
# staging or production # staging or production
TYPE="" TYPE=""
MANIFEST_FILE=manifest-9.1.4.yaml MANIFEST_FILE=manifest-9.1.5.yaml
# set type of release # set type of release
if [ ! -z $1 ]; then if [ ! -z $1 ]; then
@@ -42,8 +42,8 @@ ARCH=ppc64le make pull-devserver
ARCH=s390x make pull-devserver ARCH=s390x make pull-devserver
ARCH=amd64 make pull-advancedserver ARCH=amd64 make pull-advancedserver
ARCH=ppc64le make pull-advancedserver # ARCH=ppc64le make pull-advancedserver
ARCH=s390x make pull-advancedserver # ARCH=s390x make pull-advancedserver
function set_staging_registry { function set_staging_registry {
@@ -73,8 +73,8 @@ if [ "$TYPE" = "staging" ]; then
# push production images to staging registy # push production images to staging registy
./travis-build-scripts/push.sh production amd64 ./travis-build-scripts/push.sh production amd64
./travis-build-scripts/push.sh production ppc64le # ./travis-build-scripts/push.sh production ppc64le
./travis-build-scripts/push.sh production s390x # ./travis-build-scripts/push.sh production s390x
elif [ "$TYPE" = "production" ]; then elif [ "$TYPE" = "production" ]; then
@@ -82,8 +82,8 @@ elif [ "$TYPE" = "production" ]; then
set_staging_registry set_staging_registry
ARCH=amd64 make pull-advancedserver ARCH=amd64 make pull-advancedserver
ARCH=ppc64le make pull-advancedserver # ARCH=ppc64le make pull-advancedserver
ARCH=s390x make pull-advancedserver # ARCH=s390x make pull-advancedserver
# release developer image with fat manifest # release developer image with fat manifest
set_docker_hub set_docker_hub
@@ -103,6 +103,6 @@ elif [ "$TYPE" = "production" ]; then
set_production_registry set_production_registry
./travis-build-scripts/push.sh production amd64 ./travis-build-scripts/push.sh production amd64
./travis-build-scripts/push.sh production ppc64le # ./travis-build-scripts/push.sh production ppc64le
./travis-build-scripts/push.sh production s390x # ./travis-build-scripts/push.sh production s390x
fi fi

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

@@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
# © Copyright IBM Corporation 2019 # © Copyright IBM Corporation 2019, 2020
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.

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

@@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
# © Copyright IBM Corporation 2019 # © Copyright IBM Corporation 2019, 2020
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
@@ -20,9 +20,11 @@ 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
echo 'Testing Production image...' && echo -en 'travis_fold:start:test-advancedserver\\r' if [ "$ARCH" = "amd64" ] ; then
make test-advancedserver echo 'Testing Production image...' && echo -en 'travis_fold:start:test-advancedserver\\r'
echo -en 'travis_fold:end:test-advancedserver\\r' make test-advancedserver
echo -en 'travis_fold:end:test-advancedserver\\r'
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" ] ; then if [ "$ARCH" = "amd64" ] ; then