Skip to content

Commit 5d95c0f

Browse files
rjeberhardrjeberhard
committed
Merge branch 'xc-109769' into 'release/4.0'
fix test issues in crio jobs See merge request weblogic-cloud/weblogic-kubernetes-operator!4308
2 parents 9b0db69 + 6f5effd commit 5d95c0f

File tree

3 files changed

+25
-27
lines changed

3 files changed

+25
-27
lines changed

‎integration-tests/src/test/java/oracle/weblogic/kubernetes/ItInitContainers.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2020, 2022, Oracle and/or its affiliates.
1+
// Copyright (c) 2020, 2023, Oracle and/or its affiliates.
22
// Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
33

44
package oracle.weblogic.kubernetes;
@@ -75,7 +75,6 @@
7575
*/
7676
@DisplayName("Test server's pod init container feature")
7777
@IntegrationTest
78-
@Tag("olcne")
7978
@Tag("oke-parallel")
8079
@Tag("kind-parallel")
8180
@Tag("okd-wls-mrg")
@@ -276,7 +275,6 @@ void testAdminServerInitContainer() {
276275
@Test
277276
@DisplayName("Add initContainers to cluster1 and verify all managed server pods go through Init state ")
278277
@Tag("gate")
279-
@Tag("crio")
280278
void testClusterInitContainer() {
281279
assertTrue(createVerifyDomain(domain3Namespace, domain3Uid, "clusters"),
282280
"can't start or verify domain in namespace " + domain3Namespace);

‎integration-tests/src/test/java/oracle/weblogic/kubernetes/TestConstants.java‎

Lines changed: 18 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ public interface TestConstants {
8383
public static final String TEST_IMAGES_REPO = Optional.ofNullable(getImageRepoFromImageName(CRIO_PIPELINE_IMAGE))
8484
.orElse(System.getProperty("wko.it.test.images.repo"));
8585
public static final String TEST_IMAGES_TENANCY = System.getProperty("wko.it.test.images.tenancy");
86+
public static final String TEST_IMAGES_PREFIX = getDomainImagePrefix(TEST_IMAGES_REPO, TEST_IMAGES_TENANCY);
8687

8788
public static final String TEST_IMAGES_REPO_USERNAME = System.getenv("TEST_IMAGES_REPO_USERNAME");
8889
public static final String TEST_IMAGES_REPO_PASSWORD = System.getenv("TEST_IMAGES_REPO_PASSWORD");
@@ -135,7 +136,7 @@ public interface TestConstants {
135136
public static final String DB_IMAGE_PREBUILT_TAG = getNonEmptySystemProperty("wko.it.db.image.tag", "18.4.0-xe");
136137

137138
// WebLogic Base Image with Japanese Locale
138-
public static final String LOCALE_IMAGE_NAME = TEST_IMAGES_REPO + "/" + TEST_IMAGES_TENANCY + "/test-images/weblogic";
139+
public static final String LOCALE_IMAGE_NAME = TEST_IMAGES_PREFIX + "test-images/weblogic";
139140
public static final String LOCALE_IMAGE_TAG = "12.2.1.4-jp";
140141

141142
// For kind, replace repo name in image name with KIND_REPO,
@@ -201,8 +202,7 @@ public interface TestConstants {
201202

202203
// ELK Stack and WebLogic logging exporter constants
203204
public static final String ELASTICSEARCH_NAME = "elasticsearch";
204-
public static final String ELASTICSEARCH_IMAGE_NAME = TEST_IMAGES_REPO + "/" + TEST_IMAGES_TENANCY
205-
+ "/test-images/docker/elasticsearch";
205+
public static final String ELASTICSEARCH_IMAGE_NAME = TEST_IMAGES_PREFIX + "test-images/docker/elasticsearch";
206206
public static final String ELK_STACK_VERSION = "7.8.1";
207207
public static final String FLUENTD_IMAGE_VERSION =
208208
getNonEmptySystemProperty("wko.it.fluentd.image.version", "v1.14.5");
@@ -219,17 +219,15 @@ public interface TestConstants {
219219
public static final String WEBLOGIC_INDEX_KEY = "wls";
220220
public static final String KIBANA_INDEX_KEY = "kibana";
221221
public static final String KIBANA_NAME = "kibana";
222-
public static final String KIBANA_IMAGE_NAME = TEST_IMAGES_REPO + "/" + TEST_IMAGES_TENANCY
223-
+ "/test-images/docker/kibana";
222+
public static final String KIBANA_IMAGE_NAME = TEST_IMAGES_PREFIX + "test-images/docker/kibana";
224223
public static final String KIBANA_IMAGE = KIBANA_IMAGE_NAME + ":" + ELK_STACK_VERSION;
225224
public static final String KIBANA_TYPE = "NodePort";
226225
public static final int KIBANA_PORT = 5601;
227226
public static final String LOGSTASH_NAME = "logstash";
228-
public static final String LOGSTASH_IMAGE_NAME = TEST_IMAGES_REPO + "/" + TEST_IMAGES_TENANCY
229-
+ "/test-images/docker/logstash";
227+
public static final String LOGSTASH_IMAGE_NAME = TEST_IMAGES_PREFIX + "test-images/docker/logstash";
230228
public static final String LOGSTASH_IMAGE = LOGSTASH_IMAGE_NAME + ":" + ELK_STACK_VERSION;
231-
public static final String FLUENTD_IMAGE = TEST_IMAGES_REPO + "/" + TEST_IMAGES_TENANCY
232-
+ "/test-images/docker/fluentd-kubernetes-daemonset:"
229+
public static final String FLUENTD_IMAGE = TEST_IMAGES_PREFIX
230+
+ "test-images/docker/fluentd-kubernetes-daemonset:"
233231
+ FLUENTD_IMAGE_VERSION;
234232
public static final String JAVA_LOGGING_LEVEL_VALUE = "INFO";
235233

@@ -239,8 +237,7 @@ public interface TestConstants {
239237
public static final String MII_AUXILIARY_IMAGE_NAME = DOMAIN_IMAGES_PREFIX + "mii-ai-image";
240238
public static final boolean SKIP_BUILD_IMAGES_IF_EXISTS =
241239
Boolean.parseBoolean(getNonEmptySystemProperty("wko.it.skip.build.images.if.exists", "false"));
242-
public static final String BUSYBOX_IMAGE = TEST_IMAGES_REPO + "/" + TEST_IMAGES_TENANCY
243-
+ "/test-images/docker/busybox";
240+
public static final String BUSYBOX_IMAGE = TEST_IMAGES_PREFIX + "test-images/docker/busybox";
244241
public static final String BUSYBOX_TAG = "1.34.1";
245242

246243
// Skip the mii/wdt basic image build locally if needed
@@ -286,30 +283,28 @@ public interface TestConstants {
286283
public static final String PROMETHEUS_REPO_NAME = "prometheus-community";
287284
public static final String PROMETHEUS_REPO_URL = "https://prometheus-community.github.io/helm-charts";
288285

289-
public static final String PROMETHEUS_IMAGE_NAME = TEST_IMAGES_REPO + "/" + TEST_IMAGES_TENANCY
290-
+ "/test-images/prometheus/prometheus";
286+
public static final String PROMETHEUS_IMAGE_NAME = TEST_IMAGES_PREFIX + "test-images/prometheus/prometheus";
291287
public static final String PROMETHEUS_IMAGE_TAG = "v2.39.1";
292288

293-
public static final String PROMETHEUS_ALERT_MANAGER_IMAGE_NAME = TEST_IMAGES_REPO + "/" + TEST_IMAGES_TENANCY
294-
+ "/test-images/prometheus/alertmanager";
289+
public static final String PROMETHEUS_ALERT_MANAGER_IMAGE_NAME = TEST_IMAGES_PREFIX
290+
+ "test-images/prometheus/alertmanager";
295291
public static final String PROMETHEUS_ALERT_MANAGER_IMAGE_TAG = "v0.24.0";
296292

297-
public static final String PROMETHEUS_CONFIG_MAP_RELOAD_IMAGE_NAME = TEST_IMAGES_REPO + "/" + TEST_IMAGES_TENANCY
298-
+ "/test-images/jimmidyson/configmap-reload";
293+
public static final String PROMETHEUS_CONFIG_MAP_RELOAD_IMAGE_NAME = TEST_IMAGES_PREFIX
294+
+ "test-images/jimmidyson/configmap-reload";
299295
public static final String PROMETHEUS_CONFIG_MAP_RELOAD_IMAGE_TAG = "v0.5.0";
300296

301-
public static final String PROMETHEUS_PUSHGATEWAY_IMAGE_NAME = TEST_IMAGES_REPO + "/" + TEST_IMAGES_TENANCY
302-
+ "/test-images/prometheus/pushgateway";
297+
public static final String PROMETHEUS_PUSHGATEWAY_IMAGE_NAME = TEST_IMAGES_PREFIX
298+
+ "test-images/prometheus/pushgateway";
303299
public static final String PROMETHEUS_PUSHGATEWAY_IMAGE_TAG = "v1.4.3";
304300

305-
public static final String PROMETHEUS_NODE_EXPORTER_IMAGE_NAME = TEST_IMAGES_REPO + "/" + TEST_IMAGES_TENANCY
306-
+ "/test-images/prometheus/node-exporter";
301+
public static final String PROMETHEUS_NODE_EXPORTER_IMAGE_NAME = TEST_IMAGES_PREFIX
302+
+ "test-images/prometheus/node-exporter";
307303
public static final String PROMETHEUS_NODE_EXPORTER_IMAGE_TAG = "v1.3.1";
308304

309305
public static final String GRAFANA_REPO_NAME = "grafana";
310306
public static final String GRAFANA_REPO_URL = "https://grafana.github.io/helm-charts";
311-
public static final String GRAFANA_IMAGE_NAME = TEST_IMAGES_REPO + "/" + TEST_IMAGES_TENANCY
312-
+ "/test-images/grafana/grafana";
307+
public static final String GRAFANA_IMAGE_NAME = TEST_IMAGES_PREFIX + "test-images/grafana/grafana";
313308
public static final String GRAFANA_IMAGE_TAG = "9.3.0";
314309

315310
// credentials

‎integration-tests/src/test/java/oracle/weblogic/kubernetes/utils/ImageUtils.java‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,12 @@ public static String createImageAndVerify(String imageNameBase,
319319
Date date = new Date();
320320
final String imageTag = baseImageTag + "-" + dateFormat.format(date) + "-" + System.currentTimeMillis();
321321
// Add repository name in image name for Jenkins runs
322-
final String imageName = DOMAIN_IMAGES_REPO + imageNameBase;
322+
String imageName;
323+
if (!DOMAIN_IMAGES_REPO.endsWith("/")) {
324+
imageName = DOMAIN_IMAGES_REPO + "/" + imageNameBase;
325+
} else {
326+
imageName = DOMAIN_IMAGES_REPO + imageNameBase;
327+
}
323328
final String image = imageName + ":" + imageTag;
324329

325330
List<String> archiveList = new ArrayList<>();

0 commit comments

Comments
 (0)