Skip to content

Commit 66a845a

Browse files
thegridmanthegridman
authored
Properly support images using Coherence 14.1.1.2206 or CE 22.06 and higher (#549)
1 parent fc1a9b1 commit 66a845a

File tree

14 files changed

+92
-35
lines changed

14 files changed

+92
-35
lines changed

‎.github/workflows/build.yaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,9 @@ jobs:
5757
df -h
5858
5959
- name: Set up JDK
60-
uses: actions/setup-java@v1
60+
uses: actions/setup-java@v3
6161
with:
62+
distribution: 'zulu'
6263
java-version: '11'
6364

6465
- name: Cache Go Modules

‎.github/workflows/coherence-matrix.yaml‎

Lines changed: 46 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -29,47 +29,67 @@ jobs:
2929
fail-fast: false
3030
matrix:
3131
matrixName:
32+
- "15.1.1-0-0-SNAPSHOT"
33+
- "15.1.1-0-0-SNAPSHOT-Graal"
3234
- "22.06"
3335
- "14.1.1-2206-SNAPSHOT"
34-
- "15.1.1-0-0-SNAPSHOT"
35-
- "15.1.1-0-0-SNAPSHOT Graal"
3636
- "14.1.1-0-11-SNAPSHOT"
3737
- "14.1.1-0-10"
3838
- "14.1.1.0.0"
3939
- "12.2.1.4.0"
4040
- "12.2.1-4-15-SNAPSHOT"
4141
- "12.2.1-3-20-SNAPSHOT"
4242
include:
43+
- matrixName: "15.1.1-0-0-SNAPSHOT"
44+
coherenceVersion: "15.1.1-0-0-SNAPSHOT"
45+
javaVersion: 17
46+
coherenceImage: "iad.ocir.io/odx-stateservice/test/coherence:15.1.1-0-0-SNAPSHOT"
47+
baseImage: "gcr.io/distroless/java17-debian11"
48+
- matrixName: "15.1.1-0-0-SNAPSHOT-Graal"
49+
coherenceVersion: "15.1.1-0-0-SNAPSHOT"
50+
javaVersion: 17
51+
coherenceImage: "iad.ocir.io/odx-stateservice/test/coherence:15.1.1-0-0-SNAPSHOT-graal"
52+
baseImage: "gcr.io/distroless/java17-debian11"
4353
- matrixName: "22.06"
4454
coherenceVersion: "22.06"
45-
coherence-image: "ghcr.io/oracle/coherence-ce:22.06.1"
55+
javaVersion: 11
56+
coherenceImage: "ghcr.io/oracle/coherence-ce:22.06.1"
57+
baseImage: "gcr.io/distroless/java11-debian11"
4658
- matrixName: "14.1.1-2206-SNAPSHOT"
4759
coherenceVersion: "14.1.1-2206-SNAPSHOT"
48-
coherence-image: "iad.ocir.io/odx-stateservice/test/coherence:14.1.1-2206-2-SNAPSHOT"
49-
- matrixName: "15.1.1-0-0-SNAPSHOT"
50-
coherenceVersion: "15.1.1-0-0-SNAPSHOT"
51-
coherence-image: "iad.ocir.io/odx-stateservice/test/coherence:15.1.1-0-0-SNAPSHOT"
52-
- matrixName: "15.1.1-0-0-SNAPSHOT Graal"
53-
coherenceVersion: "15.1.1-0-0-SNAPSHOT"
54-
coherence-image: "iad.ocir.io/odx-stateservice/test/coherence:15.1.1-0-0-SNAPSHOT-graal"
60+
javaVersion: 11
61+
coherenceImage: "iad.ocir.io/odx-stateservice/test/coherence:14.1.1-2206-2-SNAPSHOT"
62+
baseImage: "gcr.io/distroless/java11-debian11"
5563
- matrixName: "14.1.1-0-11-SNAPSHOT"
5664
coherenceVersion: "14.1.1-0-11-SNAPSHOT"
57-
coherence-image: "iad.ocir.io/odx-stateservice/test/coherence:14.1.1-0-11-SNAPSHOT"
65+
javaVersion: 8
66+
coherenceImage: "iad.ocir.io/odx-stateservice/test/coherence:14.1.1-0-11-SNAPSHOT"
67+
baseImage: "gcr.io/distroless/java11-debian11"
5868
- matrixName: "14.1.1-0-10"
5969
coherenceVersion: "14.1.1-0-10"
60-
coherence-image: "ghcr.io/oracle/coherence-ce:14.1.1-0-10"
70+
javaVersion: 8
71+
coherenceImage: "ghcr.io/oracle/coherence-ce:14.1.1-0-10"
72+
baseImage: "gcr.io/distroless/java11-debian11"
6173
- matrixName: "14.1.1.0.0"
6274
coherenceVersion: "14.1.1.0.0"
63-
coherence-image: "container-registry.oracle.com/middleware/coherence:14.1.1.0.0"
75+
javaVersion: 8
76+
coherenceImage: "container-registry.oracle.com/middleware/coherence:14.1.1.0.0"
77+
baseImage: "gcr.io/distroless/java11-debian11"
6478
- matrixName: "12.2.1.4.0"
6579
coherenceVersion: "12.2.1.4.0"
66-
coherence-image: "container-registry.oracle.com/middleware/coherence:12.2.1.4.0"
80+
javaVersion: 8
81+
coherenceImage: "container-registry.oracle.com/middleware/coherence:12.2.1.4.0"
82+
baseImage: "gcr.io/distroless/java11-debian11"
6783
- matrixName: "12.2.1-4-15-SNAPSHOT"
6884
coherenceVersion: "12.2.1-4-15-SNAPSHOT"
69-
coherence-image: "iad.ocir.io/odx-stateservice/test/coherence:12.2.1-4-15-SNAPSHOT"
85+
javaVersion: 8
86+
coherenceImage: "iad.ocir.io/odx-stateservice/test/coherence:12.2.1-4-15-SNAPSHOT"
87+
baseImage: "gcr.io/distroless/java11-debian11"
7088
- matrixName: "12.2.1-3-20-SNAPSHOT"
7189
coherenceVersion: "12.2.1-3-20-SNAPSHOT"
72-
coherence-image: "iad.ocir.io/odx-stateservice/test/coherence:12.2.1-3-20-SNAPSHOT"
90+
javaVersion: 8
91+
coherenceImage: "iad.ocir.io/odx-stateservice/test/coherence:12.2.1-3-20-SNAPSHOT"
92+
baseImage: "gcr.io/distroless/java11-debian11"
7393

7494
steps:
7595
- uses: actions/checkout@v2
@@ -98,9 +118,10 @@ jobs:
98118
df -h
99119
100120
- name: Set up JDK
101-
uses: actions/setup-java@v1
121+
uses: actions/setup-java@v3
102122
with:
103-
java-version: '11'
123+
distribution: 'zulu'
124+
java-version: '17'
104125

105126
- name: Cache Go Modules
106127
uses: actions/cache@v1
@@ -139,13 +160,17 @@ jobs:
139160
docker pull gcr.io/distroless/java
140161
docker pull gcr.io/distroless/java11-debian11
141162
docker pull gcr.io/distroless/java17-debian11
142-
docker pull ${{ matrix.coherence-image }}
163+
docker pull ${{ matrix.coherenceImage }}
143164
144165
- name: Coherence Certification Tests
145166
shell: bash
146167
run: |
147-
export COHERENCE_IMAGE=${{ matrix.coherence-image }}
168+
export COHERENCE_IMAGE=${{ matrix.coherenceImage }}
148169
echo "COHERENCE_IMAGE=${COHERENCE_IMAGE}"
170+
export BUILD_JAVA_VERSION=${{ matrix.javaVersion }}
171+
echo "BUILD_JAVA_VERSION=${BUILD_JAVA_VERSION}"
172+
export COHERENCE_TEST_BASE_IMAGE=${{ matrix.baseImage }}
173+
echo "COHERENCE_TEST_BASE_IMAGE=${COHERENCE_TEST_BASE_IMAGE}"
149174
make clean
150175
echo "Building Operator Image"
151176
make build-operator-images
@@ -161,4 +186,4 @@ jobs:
161186
if: failure()
162187
with:
163188
name: test-output
164-
path: build/_output/test-logs
189+
path: build/_output/test-logs/${{ matrix.matrixName }}

‎.github/workflows/compatibility-tests.yaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,9 @@ jobs:
121121
df -h
122122
123123
- name: Set up JDK
124-
uses: actions/setup-java@v1
124+
uses: actions/setup-java@v3
125125
with:
126+
distribution: 'zulu'
126127
java-version: '11'
127128

128129
- name: Cache Go Modules

‎.github/workflows/elastic-tests.yaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,9 @@ jobs:
5757
df -h
5858
5959
- name: Set up JDK
60-
uses: actions/setup-java@v1
60+
uses: actions/setup-java@v3
6161
with:
62+
distribution: 'zulu'
6263
java-version: '11'
6364

6465
- name: Cache Go Modules

‎.github/workflows/istio-tests.yaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,9 @@ jobs:
6464
df -h
6565
6666
- name: Set up JDK
67-
uses: actions/setup-java@v1
67+
uses: actions/setup-java@v3
6868
with:
69+
distribution: 'zulu'
6970
java-version: '11'
7071

7172
- name: Cache Go Modules

‎.github/workflows/k8s-matrix.yaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,9 @@ jobs:
7070
df -h
7171
7272
- name: Set up JDK
73-
uses: actions/setup-java@v1
73+
uses: actions/setup-java@v3
7474
with:
75+
distribution: 'zulu'
7576
java-version: '11'
7677

7778
- name: Cache Go Modules

‎.github/workflows/prometheus-tests.yaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,9 @@ jobs:
5757
df -h
5858
5959
- name: Set up JDK
60-
uses: actions/setup-java@v1
60+
uses: actions/setup-java@v3
6161
with:
62+
distribution: 'zulu'
6263
java-version: '11'
6364

6465
- name: Cache Go Modules

‎.github/workflows/release.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,9 @@ jobs:
2121
fetch-depth: 0
2222

2323
- name: Set up JDK
24-
uses: actions/setup-java@v1
24+
uses: actions/setup-java@v3
2525
with:
26+
distribution: 'zulu'
2627
java-version: '11'
2728

2829
- name: Cache Go Modules

‎.github/workflows/tanzu-tests.yaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,9 @@ jobs:
6161
df -h
6262
6363
- name: Set up JDK
64-
uses: actions/setup-java@v1
64+
uses: actions/setup-java@v3
6565
with:
66+
distribution: 'zulu'
6667
java-version: '11'
6768

6869
- name: Cache Go Modules

‎Makefile‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,11 @@ PROJECT_URL = https://github.com/oracle/coherence-operator
3939
COHERENCE_VERSION ?= 21.12.4
4040
# The default Coherence image the Operator will run if no image is specified
4141
COHERENCE_IMAGE ?= ghcr.io/oracle/coherence-ce:22.06.1
42+
# The Java version that tests will be compiled to.
43+
# This should match the version required by the COHERENCE_IMAGE version
44+
BUILD_JAVA_VERSION ?= 11
45+
COHERENCE_TEST_BASE_IMAGE ?= gcr.io/distroless/java11-debian11
46+
4247
# This is the Coherence image that will be used in tests.
4348
# Changing this variable will allow test builds to be run against different Coherence versions
4449
# without altering the default image name.
@@ -70,7 +75,7 @@ OPERATOR_SDK_VERSION := v1.9.0
7075
# Options to append to the Maven command
7176
# ----------------------------------------------------------------------------------------------------------------------
7277
MAVEN_OPTIONS ?= -Dmaven.wagon.httpconnectionManager.ttlSeconds=25 -Dmaven.wagon.http.retryHandler.count=3
73-
MAVEN_BUILD_OPTS :=$(USE_MAVEN_SETTINGS) -Drevision=$(MVN_VERSION) -Dcoherence.version=$(COHERENCE_VERSION) $(MAVEN_OPTIONS)
78+
MAVEN_BUILD_OPTS :=$(USE_MAVEN_SETTINGS) -Drevision=$(MVN_VERSION) -Dcoherence.version=$(COHERENCE_VERSION) -Dcoherence.test.base.image=$(COHERENCE_TEST_BASE_IMAGE) -Dbuild.java.version=$(BUILD_JAVA_VERSION) $(MAVEN_OPTIONS)
7479

7580
# ----------------------------------------------------------------------------------------------------------------------
7681
# Operator image names

0 commit comments

Comments
 (0)