From fcc458bf31f8c03756ff0a1eecf973a05f5bf2a2 Mon Sep 17 00:00:00 2001 From: Luke Powlett Date: Wed, 5 May 2021 10:49:22 +0100 Subject: [PATCH] Updated to MQ 9.2.3 CD --- .travis.yml | 14 +++++++------- CHANGELOG.md | 4 ++++ Dockerfile-server | 2 +- config.env | 2 +- docs/building.md | 2 +- docs/security.md | 2 +- docs/testing.md | 2 +- 7 files changed, 16 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index f78ff69..b6035a6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -44,7 +44,7 @@ jobs: name: "Basic AMD64 build" os: linux env: - - MQ_ARCHIVE_REPOSITORY_DEV=$MQ_922_ARCHIVE_REPOSITORY_DEV_AMD64 + - MQ_ARCHIVE_REPOSITORY_DEV=$MQ_923_ARCHIVE_REPOSITORY_DEV_AMD64 script: bash -e travis-build-scripts/run.sh # CD Build @@ -60,8 +60,8 @@ jobs: os: linux env: - BUILD_ALL=true - - MQ_ARCHIVE_REPOSITORY=$MQ_922_ARCHIVE_REPOSITORY_AMD64 - - MQ_ARCHIVE_REPOSITORY_DEV=$MQ_922_ARCHIVE_REPOSITORY_DEV_AMD64 + - MQ_ARCHIVE_REPOSITORY=$MQ_923_ARCHIVE_REPOSITORY_AMD64 + - MQ_ARCHIVE_REPOSITORY_DEV=$MQ_923_ARCHIVE_REPOSITORY_DEV_AMD64 script: bash -e travis-build-scripts/run.sh # - if: branch = private-master OR tag =~ ^release-candidate* # name: "Multi-Arch PPC64LE build" @@ -69,8 +69,8 @@ jobs: # env: # - BUILD_ALL=true # - TEST_OPTS_DOCKER="-run TestGoldenPathWithMetrics" - # # - MQ_ARCHIVE_REPOSITORY=$MQ_922_ARCHIVE_REPOSITORY_PPC64LE - # - MQ_ARCHIVE_REPOSITORY_DEV=$MQ_922_ARCHIVE_REPOSITORY_DEV_PPC64LE + # # - MQ_ARCHIVE_REPOSITORY=$MQ_923_ARCHIVE_REPOSITORY_PPC64LE + # - MQ_ARCHIVE_REPOSITORY_DEV=$MQ_923_ARCHIVE_REPOSITORY_DEV_PPC64LE # script: bash -e travis-build-scripts/run.sh - stage: build if: branch = private-master OR tag =~ ^release-candidate* @@ -79,8 +79,8 @@ jobs: env: - BUILD_ALL=true - TEST_OPTS_DOCKER="-run TestGoldenPathWithMetrics" - - MQ_ARCHIVE_REPOSITORY=$MQ_922_ARCHIVE_REPOSITORY_S390X - - MQ_ARCHIVE_REPOSITORY_DEV=$MQ_922_ARCHIVE_REPOSITORY_DEV_S390X + - MQ_ARCHIVE_REPOSITORY=$MQ_923_ARCHIVE_REPOSITORY_S390X + - MQ_ARCHIVE_REPOSITORY_DEV=$MQ_923_ARCHIVE_REPOSITORY_DEV_S390X script: bash -e travis-build-scripts/run.sh - stage: push-manifest if: branch = private-master AND type != pull_request OR tag =~ ^release-candidate* diff --git a/CHANGELOG.md b/CHANGELOG.md index 4064f84..e49410b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Change log +## 9.2.3.0 (2021-07-22) + +* Updated to MQ version 9.2.3.0 + ## 9.2.2.0 (2021-03-26) * Updated to MQ version 9.2.2.0 diff --git a/Dockerfile-server b/Dockerfile-server index 581b092..592757a 100644 --- a/Dockerfile-server +++ b/Dockerfile-server @@ -15,7 +15,7 @@ ARG BASE_IMAGE=registry.redhat.io/ubi8/ubi-minimal ARG BASE_TAG=8.3-291 ARG GO_WORKDIR=/go/src/github.com/ibm-messaging/mq-container -ARG MQ_URL="https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/messaging/mqadv/9.2.2.0-IBM-MQ-Advanced-for-Developers-Non-Install-LinuxX64.tar.gz" +ARG MQ_URL="https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/messaging/mqadv/9.2.3.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 0c336b7..fc87e3c 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.2.2.0 +MQ_VERSION ?= 9.2.3.0 ########################################################################################################################################################### diff --git a/docs/building.md b/docs/building.md index cc1da6d..92fc4bb 100644 --- a/docs/building.md +++ b/docs/building.md @@ -20,7 +20,7 @@ From MQ 9.2.X, the MQ container adds support for MQ Long Term Support (LTS) **pr This procedure works for building the MQ Continuous Delivery release, on `amd64`, `ppc64le` and `s390x` architectures. 1. Create a `downloads` directory in the root of this repository -2. Download MQ from [IBM Passport Advantage](https://www.ibm.com/software/passportadvantage/) or [IBM Fix Central](https://www.ibm.com/support/fixcentral), and place the downloaded file (for example, `IBM_MQ_9.2.2_LINUX_X86-64_NOINST.tar.gz`) in the `downloads` directory +2. Download MQ from [IBM Passport Advantage](https://www.ibm.com/software/passportadvantage/) or [IBM Fix Central](https://www.ibm.com/support/fixcentral), and place the downloaded file (for example, `IBM_MQ_9.2.3_LINUX_X86-64_NOINST.tar.gz`) in the `downloads` directory 3. Login to the Red Hat Registry: `docker login registry.redhat.io` using your Customer Portal credentials. 4. Run `make build-advancedserver` diff --git a/docs/security.md b/docs/security.md index 4d025ad..e99029f 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.2.2.0-amd64 + ibm-mqadvanced-server:9.2.3.0-amd64 ``` diff --git a/docs/testing.md b/docs/testing.md index 7ca41c4..3a3b1f3 100644 --- a/docs/testing.md +++ b/docs/testing.md @@ -25,7 +25,7 @@ make 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.2.2.0-amd64 make test-advancedserver +MQ_IMAGE_ADVANCEDSERVER=ibm-mqadvanced-server:9.2.3.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: