Skip to content

Commit

Permalink
Update to MQ 9.3.4
Browse files Browse the repository at this point in the history
  • Loading branch information
sdmarshall79 authored and JEFFLUFC committed Nov 14, 2023
1 parent b56e570 commit 403e4f0
Show file tree
Hide file tree
Showing 7 changed files with 22 additions and 22 deletions.
30 changes: 15 additions & 15 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ services:

env:
global:
- MAIN_BRANCH=v9.3.3
- MAIN_BRANCH=v9.3.4
- TAGCACHE_FILE=tagcache
- RELEASE=r1

Expand All @@ -38,61 +38,61 @@ 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
group: vms390
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
group: power-focal
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
Expand Down
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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)

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile-server
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion config.env
Original file line number Diff line number Diff line change
@@ -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

###########################################################################################################################################################
2 changes: 1 addition & 1 deletion docs/security.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
```
2 changes: 1 addition & 1 deletion docs/testing.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion source-branch.env
Original file line number Diff line number Diff line change
Expand Up @@ -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

###########################################################################################################################################################

0 comments on commit 403e4f0

Please sign in to comment.