diff --git a/.travis.yml b/.travis.yml index 1caa2d8..74dd611 100644 --- a/.travis.yml +++ b/.travis.yml @@ -51,23 +51,23 @@ jobs: - MQ_ARCHIVE_REPOSITORY=$MQ_915_ARCHIVE_REPOSITORY_AMD64 - MQ_ARCHIVE_REPOSITORY_DEV=$MQ_915_ARCHIVE_REPOSITORY_DEV_AMD64 script: bash -e travis-build-scripts/run.sh - - if: branch = private-master OR tag =~ ^pre-release* - name: "Multi-Arch PPC64LE build" - os: linux-ppc64le - env: - - BUILD_ALL=true - - TEST_OPTS_DOCKER="-run TestGoldenPathWithMetrics" - # - 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* - name: "Multi-Arch S390X build" - os: linux-s390 - env: - - BUILD_ALL=true - - TEST_OPTS_DOCKER="-run TestGoldenPathWithMetrics" - # - MQ_ARCHIVE_REPOSITORY=$MQ_915_ARCHIVE_REPOSITORY_S390X - - MQ_ARCHIVE_REPOSITORY_DEV=$MQ_915_ARCHIVE_REPOSITORY_DEV_S390X + # - if: branch = private-master OR tag =~ ^pre-release* + # name: "Multi-Arch PPC64LE build" + # os: linux-ppc64le + # env: + # - BUILD_ALL=true + # - TEST_OPTS_DOCKER="-run TestGoldenPathWithMetrics" + # # - 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* + # name: "Multi-Arch S390X build" + # os: linux-s390 + # env: + # - BUILD_ALL=true + # - TEST_OPTS_DOCKER="-run TestGoldenPathWithMetrics" + # # - 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 name: "Pre-release deploy" diff --git a/travis-build-scripts/build.sh b/travis-build-scripts/build.sh index c9fae5a..f1b18ee 100755 --- a/travis-build-scripts/build.sh +++ b/travis-build-scripts/build.sh @@ -16,12 +16,13 @@ set -e -echo 'Building Developer JMS test image...' && echo -en 'travis_fold:start:build-devjmstest\\r' -make build-devjmstest -echo -en 'travis_fold:end:build-devjmstest\\r' -echo 'Building Developer image...' && echo -en 'travis_fold:start:build-devserver\\r' -make build-devserver -echo -en 'travis_fold:end:build-devserver\\r' +## BUILD PRODUCTION ONLY UNTIL DEV AUTH CONFIG COMPLETE +# echo 'Building Developer JMS test image...' && echo -en 'travis_fold:start:build-devjmstest\\r' +# make build-devjmstest +# echo -en 'travis_fold:end:build-devjmstest\\r' +# echo 'Building Developer image...' && echo -en 'travis_fold:start:build-devserver\\r' +# make build-devserver +# echo -en 'travis_fold:end:build-devserver\\r' if [ "$BUILD_ALL" = true ] ; then if [ "$ARCH" = "amd64" ] ; then echo 'Building Production image...' && echo -en 'travis_fold:start:build-advancedserver\\r' diff --git a/travis-build-scripts/release.sh b/travis-build-scripts/release.sh index 7a23e16..b580bdb 100755 --- a/travis-build-scripts/release.sh +++ b/travis-build-scripts/release.sh @@ -37,9 +37,10 @@ else fi ## Pull all images from default repository -ARCH=amd64 make pull-devserver -ARCH=ppc64le make pull-devserver -ARCH=s390x make pull-devserver +## BUILD PRODUCTION ONLY UNTIL DEV AUTH CONFIG COMPLETE +# ARCH=amd64 make pull-devserver +# ARCH=ppc64le make pull-devserver +# ARCH=s390x make pull-devserver ARCH=amd64 make pull-advancedserver # ARCH=ppc64le make pull-advancedserver @@ -88,16 +89,17 @@ elif [ "$TYPE" = "production" ]; then # release developer image with fat manifest set_docker_hub - ARCH=amd64 make push-devserver-dockerhub - ARCH=ppc64le make push-devserver-dockerhub - ARCH=s390x make push-devserver-dockerhub + ## BUILD PRODUCTION ONLY UNTIL DEV AUTH CONFIG COMPLETE + # ARCH=amd64 make push-devserver-dockerhub + # ARCH=ppc64le make push-devserver-dockerhub + # ARCH=s390x make push-devserver-dockerhub - curl -LO https://github.com/estesp/manifest-tool/releases/download/v0.9.0/manifest-tool-linux-amd64 - chmod a+x manifest-tool-linux-amd64 + # curl -LO https://github.com/estesp/manifest-tool/releases/download/v0.9.0/manifest-tool-linux-amd64 + # chmod a+x manifest-tool-linux-amd64 - docker login --username $MQ_DOCKERHUB_REGISTRY_USER --password $MQ_DOCKERHUB_REGISTRY_CREDENTIAL - ./manifest-tool-linux-amd64 push from-spec manifests/dockerhub/$MANIFEST_FILE - ./manifest-tool-linux-amd64 push from-spec manifests/dockerhub/manifest-latest.yaml + # docker login --username $MQ_DOCKERHUB_REGISTRY_USER --password $MQ_DOCKERHUB_REGISTRY_CREDENTIAL + # ./manifest-tool-linux-amd64 push from-spec manifests/dockerhub/$MANIFEST_FILE + # ./manifest-tool-linux-amd64 push from-spec manifests/dockerhub/manifest-latest.yaml # release production image set_production_registry diff --git a/travis-build-scripts/run.sh b/travis-build-scripts/run.sh index c942d87..c750961 100755 --- a/travis-build-scripts/run.sh +++ b/travis-build-scripts/run.sh @@ -30,7 +30,8 @@ echo -en 'travis_fold:end:docker-downgrade\\r' ## Push images if [ "$BUILD_ALL" = true ] ; then - ./travis-build-scripts/push.sh developer + ## BUILD PRODUCTION ONLY UNTIL DEV AUTH CONFIG COMPLETE + # ./travis-build-scripts/push.sh developer ./travis-build-scripts/push.sh production fi diff --git a/travis-build-scripts/test.sh b/travis-build-scripts/test.sh index a54b170..03d27fc 100755 --- a/travis-build-scripts/test.sh +++ b/travis-build-scripts/test.sh @@ -16,9 +16,10 @@ set -e -echo 'Testing Developer image...' && echo -en 'travis_fold:start:test-devserver\\r' -make test-devserver -echo -en 'travis_fold:end:test-devserver\\r' +## BUILD PRODUCTION ONLY UNTIL DEV AUTH CONFIG COMPLETE +# echo 'Testing Developer image...' && echo -en 'travis_fold:start:test-devserver\\r' +# make test-devserver +# echo -en 'travis_fold:end:test-devserver\\r' if [ "$BUILD_ALL" = true ] ; then if [ "$ARCH" = "amd64" ] ; then echo 'Testing Production image...' && echo -en 'travis_fold:start:test-advancedserver\\r'