Skip to content

Commit d7c7b52

Browse files
mirskifamirskifa
authored
Merge pull request #485 from mirskifa/v9.2.4
V9.2.4
2 parents 7fbb8ff + 60ad8f0 commit d7c7b52

18 files changed

+109
-85
lines changed

Diff for: ‎.travis.yml

+21-21
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,18 @@ sudo: required
1818
language: go
1919

2020
go:
21-
- "1.13.15"
21+
- "1.16.7"
2222

2323
services:
2424
- docker
2525

2626
env:
2727
global:
28-
- MAIN_BRANCH=v9.2.3
29-
- MQ_LTS_VERSION=9.2.0.1
28+
- MAIN_BRANCH=v9.2.4
29+
- MQ_LTS_VERSION=9.2.0.2
3030
- TAGCACHE_FILE=tagcache
3131
- RELEASE=r1
32-
- RELEASE_LTS=r1
32+
- RELEASE_LTS=r2
3333

3434
go_import_path: "github.com/ibm-messaging/mq-container"
3535

@@ -40,50 +40,50 @@ go_import_path: "github.com/ibm-messaging/mq-container"
4040
jobs:
4141
include:
4242
- stage: basic-build
43-
if: branch != v9.2.3 AND tag IS blank
43+
if: branch != v9.2.4 AND tag IS blank
4444
name: "Basic AMD64 build"
4545
os: linux
4646
env:
47-
- MQ_ARCHIVE_REPOSITORY_DEV=$MQ_923_ARCHIVE_REPOSITORY_DEV_AMD64
47+
- MQ_ARCHIVE_REPOSITORY_DEV=$MQ_924_ARCHIVE_REPOSITORY_DEV_AMD64
4848
script: bash -e travis-build-scripts/run.sh
4949

5050
# CD Build
5151

5252
- stage: global-tag
53-
if: branch = v9.2.3 AND type != pull_request OR tag =~ ^release-candidate*
53+
if: branch = v9.2.4 AND type != pull_request OR tag =~ ^release-candidate*
5454
name: "Generate Global Tag"
5555
os: linux
5656
script: bash -e travis-build-scripts/global-tag.sh
5757
- stage: build
58-
if: branch = v9.2.3 OR tag =~ ^release-candidate*
58+
if: branch = v9.2.4 OR tag =~ ^release-candidate*
5959
name: "Multi-Arch AMD64 build"
6060
os: linux
6161
env:
6262
- BUILD_ALL=true
63-
- MQ_ARCHIVE_REPOSITORY=$MQ_923_ARCHIVE_REPOSITORY_AMD64
64-
- MQ_ARCHIVE_REPOSITORY_DEV=$MQ_923_ARCHIVE_REPOSITORY_DEV_AMD64
63+
- MQ_ARCHIVE_REPOSITORY=$MQ_924_ARCHIVE_REPOSITORY_AMD64
64+
- MQ_ARCHIVE_REPOSITORY_DEV=$MQ_924_ARCHIVE_REPOSITORY_DEV_AMD64
6565
script: bash -e travis-build-scripts/run.sh
66-
# - if: branch = v9.2.3 OR tag =~ ^release-candidate*
66+
# - if: branch = v9.2.4 OR tag =~ ^release-candidate*
6767
# name: "Multi-Arch PPC64LE build"
6868
# os: linux-ppc64le
6969
# env:
7070
# - BUILD_ALL=true
7171
# - TEST_OPTS_DOCKER="-run TestGoldenPathWithMetrics"
72-
# # - MQ_ARCHIVE_REPOSITORY=$MQ_923_ARCHIVE_REPOSITORY_PPC64LE
73-
# - MQ_ARCHIVE_REPOSITORY_DEV=$MQ_923_ARCHIVE_REPOSITORY_DEV_PPC64LE
72+
# # - MQ_ARCHIVE_REPOSITORY=$MQ_924_ARCHIVE_REPOSITORY_PPC64LE
73+
# - MQ_ARCHIVE_REPOSITORY_DEV=$MQ_924_ARCHIVE_REPOSITORY_DEV_PPC64LE
7474
# script: bash -e travis-build-scripts/run.sh
7575
- stage: build
76-
if: branch = v9.2.3 OR tag =~ ^release-candidate*
76+
if: branch = v9.2.4 OR tag =~ ^release-candidate*
7777
name: "Multi-Arch S390X build"
7878
os: linux-s390
7979
env:
8080
- BUILD_ALL=true
8181
- TEST_OPTS_DOCKER="-run TestGoldenPathWithMetrics"
82-
- MQ_ARCHIVE_REPOSITORY=$MQ_923_ARCHIVE_REPOSITORY_S390X
83-
- MQ_ARCHIVE_REPOSITORY_DEV=$MQ_923_ARCHIVE_REPOSITORY_DEV_S390X
82+
- MQ_ARCHIVE_REPOSITORY=$MQ_924_ARCHIVE_REPOSITORY_S390X
83+
- MQ_ARCHIVE_REPOSITORY_DEV=$MQ_924_ARCHIVE_REPOSITORY_DEV_S390X
8484
script: bash -e travis-build-scripts/run.sh
8585
- stage: push-manifest
86-
if: branch = v9.2.3 AND type != pull_request OR tag =~ ^release-candidate*
86+
if: branch = v9.2.4 AND type != pull_request OR tag =~ ^release-candidate*
8787
name: "Push Manifest-list to registry"
8888
env:
8989
- PUSH_MANIFEST_ONLY=true
@@ -92,7 +92,7 @@ jobs:
9292
# LTS Build
9393

9494
- stage: global-tag
95-
if: branch = v9.2.3 AND type != pull_request OR tag =~ ^release-candidate*
95+
if: branch = v9.2.4 AND type != pull_request OR tag =~ ^release-candidate*
9696
name: "Generate Global Tag"
9797
os: linux
9898
env:
@@ -102,7 +102,7 @@ jobs:
102102
- RELEASE=$RELEASE_LTS
103103
script: bash -e travis-build-scripts/global-tag.sh
104104
- stage: build
105-
if: branch = v9.2.3 OR tag =~ ^release-candidate*
105+
if: branch = v9.2.4 OR tag =~ ^release-candidate*
106106
name: "Multi-Arch AMD64 build"
107107
os: linux
108108
env:
@@ -113,7 +113,7 @@ jobs:
113113
- RELEASE=$RELEASE_LTS
114114
script: bash -e travis-build-scripts/run.sh
115115
- stage: build
116-
if: branch = v9.2.3 OR tag =~ ^release-candidate*
116+
if: branch = v9.2.4 OR tag =~ ^release-candidate*
117117
name: "Multi-Arch S390X build"
118118
os: linux-s390
119119
env:
@@ -125,7 +125,7 @@ jobs:
125125
- RELEASE=$RELEASE_LTS
126126
script: bash -e travis-build-scripts/run.sh
127127
- stage: push-manifest
128-
if: branch = v9.2.3 AND type != pull_request OR tag =~ ^release-candidate*
128+
if: branch = v9.2.4 AND type != pull_request OR tag =~ ^release-candidate*
129129
name: "Push Manifest-list to registry"
130130
env:
131131
- LTS=true

Diff for: ‎.whitesource

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"settingsInheritedFrom": "whitesource-config/whitesource-config@master",
3+
"scanSettings": {
4+
"baseBranches": ["private-master", "v9.2.0.x-eus"]
5+
}
6+
}

Diff for: ‎CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Change log
22

3+
## 9.2.4.0 (2021-09-06)
4+
5+
* Updated to MQ version 9.2.4.0
6+
37
## 9.2.3.0 (2021-07-22)
48

59
* Updated to MQ version 9.2.3.0

Diff for: ‎Dockerfile-server

+6-3
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,15 @@
1313
# limitations under the License.
1414

1515
ARG BASE_IMAGE=registry.redhat.io/ubi8/ubi-minimal
16-
ARG BASE_TAG=8.4-205
16+
ARG BASE_TAG=8.5-204
17+
ARG BUILDER_IMAGE=registry.redhat.io/ubi8/go-toolset
18+
ARG BUILDER_TAG=1.16.7-5
1719
ARG GO_WORKDIR=/opt/app-root/src/go/src/github.com/ibm-messaging/mq-container
18-
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"
20+
ARG MQ_URL="https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/messaging/mqadv/9.2.4.0-IBM-MQ-Advanced-for-Developers-Non-Install-LinuxX64.tar.gz"
1921
###############################################################################
2022
# Build stage to build Go code
2123
###############################################################################
22-
FROM registry.redhat.io/ubi8/go-toolset:1.15.13-4 as builder
24+
FROM $BUILDER_IMAGE:$BUILDER_TAG as builder
2325
# The URL to download the MQ installer from in tar.gz format
2426
# This assumes an archive containing the MQ Non-Install packages
2527
ARG MQ_URL
@@ -35,6 +37,7 @@ RUN mkdir /opt/mqm \
3537
&& INSTALL_SDK=1 install-mq.sh \
3638
&& chown -R 1001:root /opt/mqm/*
3739
WORKDIR $GO_WORKDIR/
40+
COPY go.mod go.sum ./
3841
COPY cmd/ ./cmd
3942
COPY internal/ ./internal
4043
COPY pkg/ ./pkg

Diff for: ‎README.md

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# IBM MQ container
22

3+
34
[![Build Status](https://travis-ci.org/ibm-messaging/mq-container.svg?branch=master)](https://travis-ci.org/ibm-messaging/mq-container)
45

56
**Note**: The `master` branch may be in an *unstable or even broken state* during development.

Diff for: ‎config.env

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
###########################################################################################################################################################
22

33
# MQ_VERSION is the fully qualified MQ version number to build
4-
MQ_VERSION ?= 9.2.3.0
4+
MQ_VERSION ?= 9.2.4.0
55

66
###########################################################################################################################################################

Diff for: ‎docs/building.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ From MQ 9.2.X, the MQ container adds support for MQ Long Term Support (LTS) **pr
2020
This procedure works for building the MQ Continuous Delivery release, on `amd64`, `ppc64le` and `s390x` architectures.
2121

2222
1. Create a `downloads` directory in the root of this repository
23-
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
23+
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.4_LINUX_X86-64_NOINST.tar.gz`) in the `downloads` directory
2424
3. Login to the Red Hat Registry: `docker login registry.redhat.io` using your Customer Portal credentials.
2525
4. Run `make build-advancedserver`
2626

Diff for: ‎docs/security.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ docker run \
1616
--env LICENSE=accept \
1717
--env MQ_QMGR_NAME=QM1 \
1818
--detach \
19-
ibm-mqadvanced-server:9.2.3.0-amd64
19+
ibm-mqadvanced-server:9.2.4.0-amd64
2020
```

Diff for: ‎docs/testing.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ make advancedserver
2525
You can specify the image to use directly by using the `MQ_IMAGE_ADVANCEDSERVER` or `MQ_IMAGE_DEVSERVER` variables, for example:
2626

2727
```
28-
MQ_IMAGE_ADVANCEDSERVER=ibm-mqadvanced-server:9.2.3.0-amd64 make test-advancedserver
28+
MQ_IMAGE_ADVANCEDSERVER=ibm-mqadvanced-server:9.2.4.0-amd64 make test-advancedserver
2929
```
3030

3131
You can pass parameters to `go test` with an environment variable. For example, to run the "TestGoldenPath" test, run the following command:

Diff for: ‎install-build-deps.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,5 @@ set -ex
2222
sudo curl -Lo /usr/local/bin/dep https://github.com/golang/dep/releases/download/v0.5.1/dep-linux-$ARCH
2323
sudo chmod +x /usr/local/bin/dep
2424

25-
go get -u golang.org/x/lint/golint
25+
go install golang.org/x/lint/golint@latest
2626
curl -sfL https://raw.githubusercontent.com/securego/gosec/master/install.sh | sh -s -- -b $GOPATH/bin 2.0.0 || echo "Gosec not installed. Platform may not be supported."

Diff for: ‎test/docker/docker_api_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -991,7 +991,7 @@ func TestMQIniMergeOnTheSameVolumeButTwoContainers(t *testing.T) {
991991
RUN chmod 0660 /etc/mqm/test1.ini
992992
USER 1001`, imageName())},
993993
{"test1.ini",
994-
"Log:\n LogFilePages=5000"},
994+
"Log:\n LogBufferPages=128"},
995995
}
996996

997997
secondImage := createImage(t, cli, filesSecondContainer)
@@ -1011,7 +1011,7 @@ func TestMQIniMergeOnTheSameVolumeButTwoContainers(t *testing.T) {
10111011
waitForReady(t, cli, ctr2.ID)
10121012

10131013
_, test2 := execContainer(t, cli, ctr2.ID, "", []string{"bash", "-c", catIniFileCommand})
1014-
changedStanza := strings.Contains(test2, "LogFilePages=5000")
1014+
changedStanza := strings.Contains(test2, "LogBufferPages=128")
10151015
//check if stanza that was merged in the first container doesnt exist in this one.
10161016
firstMergedStanza := strings.Contains(test2, "ApplicationTrace:\n ApplName=amqsact*\n Trace=OFF")
10171017

Diff for: ‎test/docker/docker_api_test_util.go

+16-5
Original file line numberDiff line numberDiff line change
@@ -826,12 +826,23 @@ func copyFromContainer(t *testing.T, cli *client.Client, id string, file string)
826826
}
827827

828828
func getPort(t *testing.T, cli *client.Client, ID string, port int) string {
829-
i, err := cli.ContainerInspect(context.Background(), ID)
830-
if err != nil {
831-
t.Fatal(err)
829+
var inspectInfo types.ContainerJSON
830+
var err error
831+
for attemptsRemaining := 3; attemptsRemaining > 0; attemptsRemaining-- {
832+
inspectInfo, err = cli.ContainerInspect(context.Background(), ID)
833+
if err != nil {
834+
t.Fatal(err)
835+
}
836+
portNat := nat.Port(fmt.Sprintf("%d/tcp", port))
837+
if inspectInfo.NetworkSettings.Ports[portNat] == nil || len(inspectInfo.NetworkSettings.Ports[portNat]) == 0 {
838+
t.Log("Container port not yet bound")
839+
time.Sleep(1 * time.Second)
840+
continue
841+
}
842+
return inspectInfo.NetworkSettings.Ports[portNat][0].HostPort
832843
}
833-
portNat := nat.Port(fmt.Sprintf("%d/tcp", port))
834-
return i.NetworkSettings.Ports[portNat][0].HostPort
844+
t.Fatal("Failed to get port")
845+
return ""
835846
}
836847

837848
func countLines(t *testing.T, r io.Reader) int {

Diff for: ‎test/tls/client-trust.jks

346 Bytes
Binary file not shown.

Diff for: ‎test/tls/generate-test-cert.sh

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#!/bin/bash
1+
#!/bin/bash -ex
22
# -*- mode: sh -*-
3-
# © Copyright IBM Corporation 2018
3+
# © Copyright IBM Corporation 2018, 2021
44
#
55
# Licensed under the Apache License, Version 2.0 (the "License");
66
# you may not use this file except in compliance with the License.
@@ -23,6 +23,7 @@ PASSWORD=passw0rd
2323
openssl req \
2424
-newkey rsa:2048 -nodes -keyout ${KEY} \
2525
-subj "/CN=localhost" \
26+
-addext "subjectAltName = DNS:localhost" \
2627
-x509 -days 3650 -out ${CERT}
2728

2829
# Add the key and certificate to a PKCS #12 key store, for the server to use

Diff for: ‎test/tls/server.crt

+15-15
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
-----BEGIN CERTIFICATE-----
2-
MIICpDCCAYwCCQC6vpJFnfYO6TANBgkqhkiG9w0BAQsFADAUMRIwEAYDVQQDDAls
3-
b2NhbGhvc3QwHhcNMTkwMzIxMTYxMzUxWhcNMjkwMzE4MTYxMzUxWjAUMRIwEAYD
4-
VQQDDAlsb2NhbGhvc3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCu
5-
48qtIDwmihFqj2HY3dZjPfROA1MJ+D0c6aEA08ooOczthLB7XdZBQDapj8LFldyt
6-
4ZMbTkqtF5QtPXmJY0wi39foLYlcGXPL1b7y3mypaFou88BcSM3VmfILKXhNeAlt
7-
rXevnuT5kDU7sLVgKGhGwas20T1MU7d0I3bQ5z5c7egL76Hk9fYucjN6RkbwlrJ3
8-
TrCXrGIziofn3Zq1t51ygv21c80JD3XJ44YmuCrede4rhOS/4NpwRuZyiwpJ6tlv
9-
0L0QSDGCmt2JT3ty28UAsGznFzC5Qu9KyaR+9Gk4aftiyKxrYWZkgtJmMRU+C1X2
10-
kFLOHsucGmJswjwubSR7AgMBAAEwDQYJKoZIhvcNAQELBQADggEBAEdlmXVGy86P
11-
XIX5a4ZmHQ5Ns4wm7rY8vzUxlymEQ86En1PN1zAO9gV94tLyNeMptjsFEEo/uJhC
12-
Yvg3l5TIr/WCiY2+2XsSHvnbXrlbF3S0fRHa9VaCMRKjzRT68uq2Y891906YGtUE
13-
m6fCjHqVzX8qaplDf79aVkPydYaYOIZ1a/mCfQcD9XMZ/v5zI9IUDhdoq97bgPhB
14-
gBOzWLI+hkzyU8jxKAFw1Hwi9lD/P6RXL5arNb/+arOgA3vTW+xGWGevgjVK1Ay9
15-
81beWiQmn0KbeLZxj+WJ9Nntlf1M4EqPYgsSYs/IlJTYS8W1B0mDJEoovPdFTryY
16-
GyIuQEVcjUE=
2+
MIICwzCCAaugAwIBAgIJAKnwG0VGiDelMA0GCSqGSIb3DQEBCwUAMBQxEjAQBgNV
3+
BAMMCWxvY2FsaG9zdDAeFw0yMTA5MDYxNTIyMDlaFw0zMTA5MDQxNTIyMDlaMBQx
4+
EjAQBgNVBAMMCWxvY2FsaG9zdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
5+
ggEBALLmDX3OB/4DlzJzKz/Edc5qVdjdIN/u8pApSQPevT0mAsSK1uw2MObeOo4C
6+
DCBmabYeuvGzZ4t3SiejdsHK+qAYMFW51lxTbulv5kUPvTBOY2JCENkVDFjqcK8S
7+
9ItI/UzTmnBolvZmUKzROHzA/pFb/jkhlzqJO+TqIBXKLF5gdFFTiHHcqfoUyVOV
8+
n+49V8z6W2rokz4QIWa5Dlh6VS1B6VXdihJv5P9HV8P8FOtefhA85yaSVKlFS/AC
9+
XRb5FmtmYHBnghLktHS71s/KcPeX27Q1NcKhmZMvHRH95hqEcP25S6SGu69eiCLk
10+
xpbJKqG3fntfooLUDfR2PHQUJ7UCAwEAAaMYMBYwFAYDVR0RBA0wC4IJbG9jYWxo
11+
b3N0MA0GCSqGSIb3DQEBCwUAA4IBAQBamIH23oDh1XxOeMPUEyPLHm5M8LM8FNhT
12+
GEpf1ICy4TSLipSFhIs3hGzVt22zBBzU59apQ8rXUME5SK+9PLag/t/48rG1SfUA
13+
VyYvaeu/cA5NQMWwuyCLqZL1MWn+BLsdAiNtbNHANesnl0i+vUb0GPzSP8soe3PP
14+
N7Fh8SO3Qq6e9zT3iE2tP2OFxzcpg538Xn3qoVPJwmLIfBtvsiK07zqAWdqBWtt6
15+
cBXyagnmgKvOyv6sKAlTpwP9HqVem3XxZVrhm1KiPHs4Dnks6e79txmB8lqzvWu5
16+
tu4h2ePGJjqUy5JkkoDY0j6hALwEe3ZXBvJ6XUQDi9Hou2k+MaQd
1717
-----END CERTIFICATE-----

Diff for: ‎test/tls/server.key

+26-26
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
11
-----BEGIN PRIVATE KEY-----
2-
MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCu48qtIDwmihFq
3-
j2HY3dZjPfROA1MJ+D0c6aEA08ooOczthLB7XdZBQDapj8LFldyt4ZMbTkqtF5Qt
4-
PXmJY0wi39foLYlcGXPL1b7y3mypaFou88BcSM3VmfILKXhNeAltrXevnuT5kDU7
5-
sLVgKGhGwas20T1MU7d0I3bQ5z5c7egL76Hk9fYucjN6RkbwlrJ3TrCXrGIziofn
6-
3Zq1t51ygv21c80JD3XJ44YmuCrede4rhOS/4NpwRuZyiwpJ6tlv0L0QSDGCmt2J
7-
T3ty28UAsGznFzC5Qu9KyaR+9Gk4aftiyKxrYWZkgtJmMRU+C1X2kFLOHsucGmJs
8-
wjwubSR7AgMBAAECggEAH9t6teKjUlngJksMBdcTEGzerb9JRw2jBDtCisYJkx5E
9-
SBfdlftX5fbufiCj2B4eXsYyZ8zxKWqcIUmLdA1Udx3TVIXG+bHhOAYtjEwb+xf5
10-
JYhdR/IzHG+4eXQKaAIvpXztyl3lU9iC+eaMg4GYzRrGN2wSAG9XgZ5cLF2TLJYU
11-
jPxp7goz9X6V57aL2G/EFlbFsMaI/6cW7+XoRdo0I4N2Z766gz7GgyxtTVwR5Peq
12-
LjOpqSNS0W57KJxReURfySok9CP1DfyigopsYW8O4jGVDDRLdiN3I8+JhWya2E0j
13-
96hHpN04Oz6HnMm7bdZDVtkZCOiu6xIzLJJxZ4o+kQKBgQDYqOA/hSod7s7w4LBE
14-
A6Mp+e0//PYH6/N9SKmSIgQNec9bMGI4yanoblMbg4GM1g7pkvjlC0nTdjnUbLkB
15-
vIvtVh3XwTIlrZ/4lc7VB23/hmKU+lRc+NJP5fgasAQu0W3+qp2cXo0pnHVwBEku
16-
Z7FwDPX0JNDIi/Or2I7dt8JojQKBgQDOpU1AnIXv1/cToYK4nz8BWLxRxwLTxy5A
17-
ucafNKacPlxb5luZRCExiPZwAM8Z3zI9o99rYXOPQmsnknZWJV66Zx0Vo0yTD1CT
18-
DWMUj0ugI1wORNMhwZP6YBYWjAeupyU9a7FyU1Geg4sdQt5rMyAEQOoECc8x8foP
19-
rySHuO/TJwKBgBjMM2ZxymFErQDa5rHSLMGoLmRtgodjlSnYwDfOluIn9/i67/MJ
20-
+d11iyOSCKji8y/+t2gXw6plVLcgfohZWTaf7ah9H006sx2Tn+m4APoHGo9sm21M
21-
uV2Vt7DuRnxJUiqcwo9cLxH9K1/Xzbx299MYWKpJ8G+TvR8FGUz9NE4dAoGAM5gs
22-
KKSsAE1QwFMEG2qPRZvNMTHaL9w8XSbFQ7zWmI4tazihyCutifujZCWfj9sdZSyE
23-
PQBQ5QT1UiUMbMfZ1fqm1V83YERjnsOp6Fk6zZnmgx2GBZiahNn2ydxekqni72nz
24-
HRNWfphjZIPsmqFiLg2zIBz+4X6EK+RT35s6LeMCgYEAwF/9jX8kONW5KKZdoNHa
25-
opkLpa9qkwTGQ9M3AZiRUjM4rtvggYt8FBEP+3BLDLHqfUOkPq82MCRXm+6Cz+sT
26-
gyPnsPlAh/sr3Pys3olJbUDE9H24k1LU0CI/sSwAFkka0+Q7PVTTe/Dcavitrcrm
27-
+fyiT2oSPZeHSjQE9iIW3OY=
2+
MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCy5g19zgf+A5cy
3+
cys/xHXOalXY3SDf7vKQKUkD3r09JgLEitbsNjDm3jqOAgwgZmm2Hrrxs2eLd0on
4+
o3bByvqgGDBVudZcU27pb+ZFD70wTmNiQhDZFQxY6nCvEvSLSP1M05pwaJb2ZlCs
5+
0Th8wP6RW/45IZc6iTvk6iAVyixeYHRRU4hx3Kn6FMlTlZ/uPVfM+ltq6JM+ECFm
6+
uQ5YelUtQelV3YoSb+T/R1fD/BTrXn4QPOcmklSpRUvwAl0W+RZrZmBwZ4IS5LR0
7+
u9bPynD3l9u0NTXCoZmTLx0R/eYahHD9uUukhruvXogi5MaWySqht357X6KC1A30
8+
djx0FCe1AgMBAAECggEAagD5A49+mtwjzigB+4H80Def8KVuomIi5psgAaQM+9u3
9+
DiC6ozKlHVeW2KiL6PLmNpzU5v0IINKpZP1uE/yjLxPGKDW6t/BUKww8JLXjw2jf
10+
aMx+0TKwo0sfRA32S0YPmWNVAsBmm1AbA5vhXcK51QXuiInH406H5+d25ZJrYevF
11+
liKWSjx9CM/0XO7t20j18mCa8RjBEdsZoHxHsoWNvFJ6DCR25cFShAhR7s4OtkUk
12+
yELm1tYYrFOffUM0Q/Fp9uSlCHWMSqPtf/6NEfnszfFEtzDh/N+YqC1Bexv0XPsD
13+
dBPOkUZjWA2Sc8Se1t2GLfrRURzj3GvWH1+GssjsAQKBgQDeIdyzQSqce4Kn0opa
14+
vdS5moCiv3pyfNd0nYe0awgVos4kHY7/nBq0eyMZAatRHeD3DunVsw3LmvWyEw53
15+
app7MTTjVrYaadoBlB6jy2elyF5RcW2jGchZExoNh+0ZQWUiMbYEozPLQTy9ZxMz
16+
t0OcZ1hHPngGgmj5TELZKkwEtQKBgQDOLLh7pdKrdudtim+o4H20jl5yYKl25Iq/
17+
DKVodwUd94cM7xAIOQJrx2XK/YPCfRkKRN1wxzAhYdIVkaaKDVhI8Jeu+H18QOa6
18+
5OlzzZcqJCtACpbVqLaDcmq8pRrAYekiwMIKwC95llvktjilvLfoUnQoXAaX8E8B
19+
yCSUvDh3AQKBgQCxa0h04DLho4Da/D3HdmHHERF3bAqoEPCh0wTF5MsjRNLzY6yI
20+
mq11w/hni77C3mOF0SKRrh7xpcZiQfhHBx12EfpVLjfq5uraYe0LFHanol87G6bf
21+
I8Oy6Z/geNW2W1YktqHUGGpRCL0z5nUe1FyrOpv2431Ibbbcj73A6JipFQKBgHdl
22+
vJyWpk73+AQe1JUnFIU4oYd5ZQpeRd9n8m5x5ru4+jPKSi2I3lcOTWvlrqU2Dwc8
23+
ZEUIhV3/qUsmYxy1p7ft5NnGO912NGhtYqjWmcEk2wsmVr17C99JpniC4OAik4G1
24+
wWm6bIPsSGFGCb4pcROQlIY+7O6WkxqEDnM4ITcBAoGAHXBKmadFpupUeGSkCwEo
25+
/VjeI4QoKKcWj9K8z8ifCVPz1FiQ1AJ91WMTM7PAmpEDX058Hor9xxJ2bEtQFwUS
26+
QKvjeU+/Ig0TWjsJBgBPvc0xYLaJptAbjvG4a5nBn7hwbRzLTcKx2OVTmdAkz00H
27+
1lq8cwizfwNgt8ldFFDDRvw=
2828
-----END PRIVATE KEY-----

Diff for: ‎test/tls/server.p12

24 Bytes
Binary file not shown.

Diff for: ‎travis-build-scripts/push.sh

+4-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
# © Copyright IBM Corporation 2019, 2020
3+
# © Copyright IBM Corporation 2019, 2021
44
#
55
# Licensed under the Apache License, Version 2.0 (the "License");
66
# you may not use this file except in compliance with the License.
@@ -32,11 +32,9 @@ function push_developer {
3232
}
3333

3434
function push_production {
35-
if [[ "$ARCH" = "amd64" || "$ARCH" = "s390x" ]] ; then
36-
echo 'Pushing Production image...' && echo -en 'travis_fold:start:push-advancedserver\\r'
37-
make push-advancedserver
38-
echo -en 'travis_fold:end:push-advancedserver\\r'
39-
fi
35+
echo 'Pushing Production image...' && echo -en 'travis_fold:start:push-advancedserver\\r'
36+
make push-advancedserver
37+
echo -en 'travis_fold:end:push-advancedserver\\r'
4038
}
4139

4240
# call relevant push function

0 commit comments

Comments
 (0)