diff --git a/.travis.yml b/.travis.yml index a958f84f..78b436eb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,7 +25,7 @@ services: env: global: - - MAIN_BRANCH=v9.3.3 + - MAIN_BRANCH=v9.3.4 - TAGCACHE_FILE=tagcache - RELEASE=r1 @@ -38,33 +38,33 @@ go_import_path: "github.com/ibm-messaging/mq-container" jobs: include: - stage: basic-build - if: branch != v9.3.3 AND tag IS blank + if: branch != v9.3.4 AND tag IS blank name: "Basic AMD64 build" os: linux env: - - MQ_ARCHIVE_REPOSITORY_DEV=$MQ_933_ARCHIVE_REPOSITORY_DEV_AMD64 + - MQ_ARCHIVE_REPOSITORY_DEV=$MQ_934_ARCHIVE_REPOSITORY_DEV_AMD64 script: bash -e travis-build-scripts/run.sh # CD Build - stage: global-tag - if: branch = v9.3.3 AND type != pull_request OR tag =~ ^release-candidate* + if: branch = v9.3.4 AND type != pull_request OR tag =~ ^release-candidate* name: "Generate Global Tag" os: linux script: bash -e travis-build-scripts/global-tag.sh - stage: build - if: branch = v9.3.3 OR tag =~ ^release-candidate* + if: branch = v9.3.4 OR tag =~ ^release-candidate* name: "Multi-Arch AMD64 build" os: linux env: - BUILD_ALL=true - - MQ_ARCHIVE_REPOSITORY=$MQ_933_ARCHIVE_REPOSITORY_AMD64 - - MQ_ARCHIVE_REPOSITORY_DEV=$MQ_933_ARCHIVE_REPOSITORY_DEV_AMD64 + - MQ_ARCHIVE_REPOSITORY=$MQ_934_ARCHIVE_REPOSITORY_AMD64 + - MQ_ARCHIVE_REPOSITORY_DEV=$MQ_934_ARCHIVE_REPOSITORY_DEV_AMD64 script: - bash travis-build-scripts/travis-log-keepalive.sh & - bash -e travis-build-scripts/run.sh - stage: build - if: branch = v9.3.3 OR tag =~ ^release-candidate* + if: branch = v9.3.4 OR tag =~ ^release-candidate* name: "Multi-Arch S390X build" os: linux arch: s390x @@ -72,13 +72,13 @@ jobs: env: - BUILD_ALL=true - TEST_OPTS_DOCKER="-run TestGoldenPathWithMetrics" - - MQ_ARCHIVE_REPOSITORY=$MQ_933_ARCHIVE_REPOSITORY_S390X - - MQ_ARCHIVE_REPOSITORY_DEV=$MQ_933_ARCHIVE_REPOSITORY_DEV_S390X - script: + - MQ_ARCHIVE_REPOSITORY=$MQ_934_ARCHIVE_REPOSITORY_S390X + - MQ_ARCHIVE_REPOSITORY_DEV=$MQ_934_ARCHIVE_REPOSITORY_DEV_S390X + script: - bash travis-build-scripts/travis-log-keepalive.sh & - bash -e travis-build-scripts/run.sh - stage: build - if: branch = v9.3.3 OR tag =~ ^release-candidate* + if: branch = v9.3.4 OR tag =~ ^release-candidate* name: "Multi-Arch PPC64LE build" os: linux arch: ppc64le @@ -86,13 +86,13 @@ jobs: env: - BUILD_ALL=true - TEST_OPTS_DOCKER="-run TestGoldenPathWithMetrics" - - MQ_ARCHIVE_REPOSITORY=$MQ_933_ARCHIVE_REPOSITORY_PPC64LE - - MQ_ARCHIVE_REPOSITORY_DEV=$MQ_933_ARCHIVE_REPOSITORY_DEV_PPC64LE + - MQ_ARCHIVE_REPOSITORY=$MQ_934_ARCHIVE_REPOSITORY_PPC64LE + - MQ_ARCHIVE_REPOSITORY_DEV=$MQ_934_ARCHIVE_REPOSITORY_DEV_PPC64LE script: - bash travis-build-scripts/travis-log-keepalive.sh & - bash -e travis-build-scripts/run.sh - stage: push-manifest - if: branch = v9.3.3 AND type != pull_request OR tag =~ ^release-candidate* + if: branch = v9.3.4 AND type != pull_request OR tag =~ ^release-candidate* name: "Push Manifest-list to registry" env: - PUSH_MANIFEST_ONLY=true diff --git a/CHANGELOG.md b/CHANGELOG.md index 82f9830c..d5e0eb72 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ # Change log -## 9.3.3.2-r1 (2023-08) +## 9.3.4.0 (2023-10) -* Updated to MQ version 9.3.3.2-r1 +* Updated to MQ version 9.3.4.0 ## 9.3.3.1-r1 (2023-08) diff --git a/Dockerfile-server b/Dockerfile-server index 13aca040..227090e4 100644 --- a/Dockerfile-server +++ b/Dockerfile-server @@ -17,7 +17,7 @@ ARG BASE_TAG=8.8-1072.1697626218 ARG BUILDER_IMAGE=registry.access.redhat.com/ubi8/go-toolset ARG BUILDER_TAG=1.19.13-2.1698062273 ARG GO_WORKDIR=/opt/app-root/src/go/src/github.com/ibm-messaging/mq-container -ARG MQ_ARCHIVE="downloads/9.3.3.2-IBM-MQ-Advanced-for-Developers-Non-Install-LinuxX64.tar.gz" +ARG MQ_ARCHIVE="downloads/9.3.4.0-IBM-MQ-Advanced-for-Developers-Non-Install-LinuxX64.tar.gz" ############################################################################### # Build stage to build Go code diff --git a/config.env b/config.env index 42594407..e48909ca 100644 --- a/config.env +++ b/config.env @@ -1,6 +1,6 @@ ########################################################################################################################################################### # MQ_VERSION is the fully qualified MQ version number to build -MQ_VERSION ?= 9.3.3.2 +MQ_VERSION ?= 9.3.4.0 ########################################################################################################################################################### diff --git a/docs/security.md b/docs/security.md index 087f52a5..1e577daa 100644 --- a/docs/security.md +++ b/docs/security.md @@ -16,5 +16,5 @@ docker run \ --env LICENSE=accept \ --env MQ_QMGR_NAME=QM1 \ --detach \ - ibm-mqadvanced-server:9.3.3.2-amd64 + ibm-mqadvanced-server:9.3.4.0-amd64 ``` diff --git a/docs/testing.md b/docs/testing.md index a4cffefe..4e0e94af 100644 --- a/docs/testing.md +++ b/docs/testing.md @@ -24,7 +24,7 @@ make test-advancedserver You can specify the image to use directly by using the `MQ_IMAGE_ADVANCEDSERVER` or `MQ_IMAGE_DEVSERVER` variables, for example: ``` -MQ_IMAGE_ADVANCEDSERVER=ibm-mqadvanced-server:9.3.3.2-amd64 make test-advancedserver +MQ_IMAGE_ADVANCEDSERVER=ibm-mqadvanced-server:9.3.4.0-amd64 make test-advancedserver ``` You can pass parameters to `go test` with an environment variable. For example, to run the "TestGoldenPath" test, run the following command: diff --git a/source-branch.env b/source-branch.env index ab426552..f0420d5a 100644 --- a/source-branch.env +++ b/source-branch.env @@ -2,6 +2,6 @@ # SOURCE_BRANCH is the repository branch name for this release stream. # It should be updated when a new release fork is created but not for testing of personal builds or pre-fork updates. -SOURCE_BRANCH ?= v9.3.3 +SOURCE_BRANCH ?= v9.3.4 ###########################################################################################################################################################