diff --git a/.travis.yml b/.travis.yml index f2e30ec..1caa2d8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -57,7 +57,7 @@ jobs: env: - BUILD_ALL=true - 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 script: bash -e travis-build-scripts/run.sh - if: branch = private-master OR tag =~ ^pre-release* @@ -66,7 +66,7 @@ jobs: env: - BUILD_ALL=true - 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 script: bash -e travis-build-scripts/run.sh - stage: deploy diff --git a/manifests/dockerhub/manifest-9.1.5.yaml b/manifests/dockerhub/manifest-9.1.5.yaml new file mode 100644 index 0000000..18e122b --- /dev/null +++ b/manifests/dockerhub/manifest-9.1.5.yaml @@ -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 \ No newline at end of file diff --git a/manifests/dockerhub/manifest-latest.yaml b/manifests/dockerhub/manifest-latest.yaml index 5d1e0ac..0dfbabc 100644 --- a/manifests/dockerhub/manifest-latest.yaml +++ b/manifests/dockerhub/manifest-latest.yaml @@ -1,4 +1,4 @@ -# © Copyright IBM Corporation 2018, 2019 +# © Copyright IBM Corporation 2018, 2020 # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -14,15 +14,15 @@ image: ibmcom/mq:latest manifests: - - image: ibmcom/mq:9.1.4.0-r1-amd64 + - image: ibmcom/mq:9.1.5.0-r1-amd64 platform: architecture: amd64 os: linux - - image: ibmcom/mq:9.1.4.0-r1-ppc64le + - image: ibmcom/mq:9.1.5.0-r1-ppc64le platform: architecture: ppc64le os: linux - - image: ibmcom/mq:9.1.4.0-r1-s390x + - image: ibmcom/mq:9.1.5.0-r1-s390x platform: architecture: s390x os: linux diff --git a/travis-build-scripts/build.sh b/travis-build-scripts/build.sh index 83f789f..c9fae5a 100755 --- a/travis-build-scripts/build.sh +++ b/travis-build-scripts/build.sh @@ -1,6 +1,6 @@ #!/bin/bash -# © Copyright IBM Corporation 2019 +# © Copyright IBM Corporation 2019, 2020 # # Licensed under the Apache License, Version 2.0 (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 echo -en 'travis_fold:end:build-devserver\\r' if [ "$BUILD_ALL" = true ] ; then - echo 'Building Production image...' && echo -en 'travis_fold:start:build-advancedserver\\r' - make build-advancedserver - echo -en 'travis_fold:end:build-advancedserver\\r' + if [ "$ARCH" = "amd64" ] ; then + echo 'Building Production image...' && echo -en 'travis_fold:start:build-advancedserver\\r' + make build-advancedserver + echo -en 'travis_fold:end:build-advancedserver\\r' + fi fi diff --git a/travis-build-scripts/push.sh b/travis-build-scripts/push.sh index 7488896..55154bb 100755 --- a/travis-build-scripts/push.sh +++ b/travis-build-scripts/push.sh @@ -1,6 +1,6 @@ #!/bin/bash -# © Copyright IBM Corporation 2019 +# © Copyright IBM Corporation 2019, 2020 # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -32,9 +32,11 @@ function push_developer { } function push_production { - echo 'Pushing Production image...' && echo -en 'travis_fold:start:push-advancedserver\\r' - make push-advancedserver - echo -en 'travis_fold:end:push-advancedserver\\r' + if [ "$ARCH" = "amd64" ] ; then + echo 'Pushing Production image...' && echo -en 'travis_fold:start:push-advancedserver\\r' + make push-advancedserver + echo -en 'travis_fold:end:push-advancedserver\\r' + fi } # call relevant push function diff --git a/travis-build-scripts/release.sh b/travis-build-scripts/release.sh index d6e6b65..7a23e16 100755 --- a/travis-build-scripts/release.sh +++ b/travis-build-scripts/release.sh @@ -1,6 +1,6 @@ #!/bin/bash -# © Copyright IBM Corporation 2019 +# © Copyright IBM Corporation 2019, 2020 # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -18,7 +18,7 @@ set -e # staging or production TYPE="" -MANIFEST_FILE=manifest-9.1.4.yaml +MANIFEST_FILE=manifest-9.1.5.yaml # set type of release if [ ! -z $1 ]; then @@ -42,8 +42,8 @@ ARCH=ppc64le make pull-devserver ARCH=s390x make pull-devserver ARCH=amd64 make pull-advancedserver -ARCH=ppc64le make pull-advancedserver -ARCH=s390x make pull-advancedserver +# ARCH=ppc64le make pull-advancedserver +# ARCH=s390x make pull-advancedserver function set_staging_registry { @@ -73,8 +73,8 @@ if [ "$TYPE" = "staging" ]; then # push production images to staging registy ./travis-build-scripts/push.sh production amd64 - ./travis-build-scripts/push.sh production ppc64le - ./travis-build-scripts/push.sh production s390x + # ./travis-build-scripts/push.sh production ppc64le + # ./travis-build-scripts/push.sh production s390x elif [ "$TYPE" = "production" ]; then @@ -82,8 +82,8 @@ elif [ "$TYPE" = "production" ]; then set_staging_registry ARCH=amd64 make pull-advancedserver - ARCH=ppc64le make pull-advancedserver - ARCH=s390x make pull-advancedserver + # ARCH=ppc64le make pull-advancedserver + # ARCH=s390x make pull-advancedserver # release developer image with fat manifest set_docker_hub @@ -103,6 +103,6 @@ elif [ "$TYPE" = "production" ]; then set_production_registry ./travis-build-scripts/push.sh production amd64 - ./travis-build-scripts/push.sh production ppc64le - ./travis-build-scripts/push.sh production s390x + # ./travis-build-scripts/push.sh production ppc64le + # ./travis-build-scripts/push.sh production s390x fi diff --git a/travis-build-scripts/run.sh b/travis-build-scripts/run.sh index bccd4c6..c942d87 100755 --- a/travis-build-scripts/run.sh +++ b/travis-build-scripts/run.sh @@ -1,6 +1,6 @@ #!/bin/bash -# © Copyright IBM Corporation 2019 +# © Copyright IBM Corporation 2019, 2020 # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/travis-build-scripts/test.sh b/travis-build-scripts/test.sh index 485263d..a54b170 100755 --- a/travis-build-scripts/test.sh +++ b/travis-build-scripts/test.sh @@ -1,6 +1,6 @@ #!/bin/bash -# © Copyright IBM Corporation 2019 +# © Copyright IBM Corporation 2019, 2020 # # Licensed under the Apache License, Version 2.0 (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 echo -en 'travis_fold:end:test-devserver\\r' if [ "$BUILD_ALL" = true ] ; then - echo 'Testing Production image...' && echo -en 'travis_fold:start:test-advancedserver\\r' - make test-advancedserver - echo -en 'travis_fold:end:test-advancedserver\\r' + if [ "$ARCH" = "amd64" ] ; then + echo 'Testing Production image...' && echo -en 'travis_fold:start:test-advancedserver\\r' + make test-advancedserver + echo -en 'travis_fold:end:test-advancedserver\\r' + fi fi echo 'Running gosec scan...' && echo -en 'travis_fold:start:gosec-scan\\r' if [ "$ARCH" = "amd64" ] ; then