Merge branch 'server-jre-ocir' into 'main'

Allow Jenkins to override location of ServerJRE container image for integration tests

See merge request weblogic-cloud/weblogic-image-tool!448

Author: ddsharpe

Jenkinsfile

@@ -17,6 +17,7 @@ pipeline {
         // variables for SystemTest stages (integration tests)
         STAGING_DIR = "${WORKSPACE}/wit-system-test-files"
         DB_IMAGE = "${WKT_OCIR_HOST}/${WKT_TENANCY}/database/enterprise:12.2.0.1-slim"
+        JRE_IMAGE = "${WKT_OCIR_HOST}/${WKT_TENANCY}/java/serverjre:8"
     }
 
     stages {
@@ -99,7 +100,7 @@ pipeline {
                     withMaven(globalMavenSettingsConfig: 'wkt-maven-settings-xml', publisherStrategy: 'EXPLICIT') {
                         sh '''
                             cd tests
-                            mvn -B clean verify -Dtest.staging.dir=${STAGING_DIR} -Dtest.groups=gate -DskipITs=false
+                            mvn -B clean verify -Dtest.groups=gate -DskipITs=false
                         '''
                     }
                 }
@@ -123,12 +124,13 @@ pipeline {
             steps {
                 script {
                     docker.image("${env.DB_IMAGE}").pull()
+                    docker.image("${env.JRE_IMAGE}").pull()
                 }
                 withCredentials([[$class: 'UsernamePasswordMultiBinding', credentialsId: 'wkt-otn-credential', passwordVariable: 'ORACLE_SUPPORT_PASSWORD', usernameVariable: 'ORACLE_SUPPORT_USERNAME']]) {
                     withMaven(globalMavenSettingsConfig: 'wkt-maven-settings-xml', publisherStrategy: 'EXPLICIT') {
                         sh '''
                             cd tests
-                            mvn -B clean verify -Dtest.staging.dir=${STAGING_DIR} -Dtest.groups=gate,nightly -DskipITs=false
+                            mvn -B clean verify -Dtest.groups=gate,nightly -DskipITs=false
                         '''
                     }
                 }

installer/pom.xml

@@ -50,7 +50,6 @@
                             <goal>single</goal>
                         </goals>
                         <configuration>
-                            <finalName>imagetool</finalName>
                             <descriptors>
                                 <descriptor>src/assembly/zip.xml</descriptor>
                             </descriptors>

pom.xml

@@ -37,8 +37,12 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
+
         <test.groups>gate</test.groups>
         <skipITs>true</skipITs>
+        <test.staging.dir>${env.STAGING_DIR}</test.staging.dir>
+        <test.db.image>${env.DB_IMAGE}</test.db.image>
+        <test.java.image>${env.JRE_IMAGE}</test.java.image>
     </properties>
 
     <modules>
@@ -91,6 +95,7 @@
     </dependencyManagement>
 
     <build>
+        <finalName>imagetool</finalName>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -113,10 +118,6 @@
                                     <variableName>ORACLE_SUPPORT_PASSWORD</variableName>
                                     <message>For integration tests, you must set the environment variable ORACLE_SUPPORT_PASSWORD to match the ORACLE_SUPPORT_USERNAME credential.</message>
                                 </requireEnvironmentVariable>
-                                <requireEnvironmentVariable>
-                                    <variableName>DB_IMAGE</variableName>
-                                    <message>For integration tests, you must set the environment variable DB_IMAGE to a database container image.</message>
-                                </requireEnvironmentVariable>
                                 <requireProperty>
                                     <property>test.staging.dir</property>
                                     <message>For integration tests, you must define the test.staging.dir System property to point to the directory where the installers are staged. Or, set STAGING_DIR environment variable.</message>
@@ -134,7 +135,6 @@
                     <artifactId>maven-jar-plugin</artifactId>
                     <version>3.3.0</version>
                     <configuration>
-                        <finalName>${project.artifactId}</finalName>
                         <archive>
                             <manifest>
                                 <addDefaultImplementationEntries>true</addDefaultImplementationEntries>

tests/pom.xml

@@ -91,7 +91,8 @@
                         <WLSIMG_BLDDIR>${project.build.directory}/blddir</WLSIMG_BLDDIR>
                         <WLSIMG_CACHEDIR>${project.build.directory}/cachedir</WLSIMG_CACHEDIR>
                         <STAGING_DIR>${test.staging.dir}</STAGING_DIR>
-                        <DB_IMAGE>${env.DB_IMAGE}</DB_IMAGE>
+                        <DB_IMAGE>${test.db.image}</DB_IMAGE>
+                        <JRE_IMAGE>${test.java.image}</JRE_IMAGE>
                     </systemPropertyVariables>
                 </configuration>
                 <executions>

tests/src/test/java/com/oracle/weblogic/imagetool/tests/ITImagetool.java

@@ -56,7 +56,8 @@ class ITImagetool {
     private static final String wlsImgCacheDir = System.getProperty("WLSIMG_CACHEDIR");
 
     // Docker images
-    private static final String DB_IMAGE = System.getProperty("DB_IMAGE");
+    private static String DB_IMAGE = System.getProperty("DB_IMAGE");
+    private static String JRE_IMAGE = System.getProperty("JRE_IMAGE");
 
     // Staging Dir files
     private static final String JDK_INSTALLER = "jdk-8u202-linux-x64.tar.gz";
@@ -103,16 +104,22 @@ private static void validateEnvironmentSettings() {
             missingSettings.add("STAGING_DIR");
         }
 
-        if (Utils.isEmptyString(DB_IMAGE)) {
-            missingSettings.add("DB_IMAGE");
-        }
-
         if (missingSettings.size() > 0) {
             String error = String.join(", ", missingSettings)
                 + " must be set as a system property in the pom.xml";
             throw new IllegalArgumentException(error);
         }
 
+        if (Utils.isEmptyString(DB_IMAGE)) {
+            //default to container-registry.oracle.com image
+            DB_IMAGE = "container-registry.oracle.com/database/enterprise:12.2.0.1-slim";
+        }
+
+        if (Utils.isEmptyString(JRE_IMAGE)) {
+            //default to container-registry.oracle.com image
+            JRE_IMAGE = "container-registry.oracle.com/java/serverjre:8";
+        }
+
         // get the build tag from Jenkins build environment variable BUILD_TAG
         build_tag = System.getenv("BUILD_TAG");
         if (build_tag != null) {
@@ -126,6 +133,7 @@ private static void validateEnvironmentSettings() {
         logger.info("WLSIMG_CACHEDIR = " + wlsImgCacheDir);
         logger.info("STAGING_DIR = " + STAGING_DIR);
         logger.info("DB_IMAGE = " + DB_IMAGE);
+        logger.info("JRE_IMAGE = " + JRE_IMAGE);
     }
 
     private static void verifyStagedFiles(String... installers) {
@@ -791,7 +799,6 @@ void createFmwImgFullInternetAccess(TestInfo testInfo) throws Exception {
 
     /**
      * create a JRF domain image using WDT
-     * You need to have OCR credentials to pull container-registry.oracle.com/database/enterprise:12.2.0.1-slim
      *
      * @throws Exception - if any error occurs
      */
@@ -975,7 +982,7 @@ void createImageWithServerJRE(TestInfo testInfo) throws Exception {
         String tagName = build_tag + ":" + getMethodName(testInfo);
         String command = new CreateCommand()
             .tag(tagName)
-            .fromImage("container-registry.oracle.com/java/serverjre:8")
+            .fromImage(JRE_IMAGE)
             .build();
 
         try (PrintWriter out = getTestMethodWriter(testInfo)) {