Merge pull request #4392 from joepvd/fix-default-image-dtection

Test assembly updater: Fix base image detector

Author: openshift-merge-bot[bot]

scheduled-jobs/build/update-test-assembly/Jenkinsfile

@@ -12,10 +12,11 @@ node() {
 
     // Define base images we want to keep current
     def base_images = [
+
         '4.12': 'openshift-base-nodejs,openshift-base-rhel8,openshift-base-rhel9,openshift-enterprise-base',
-        '4.13': 'openshift-base-nodejs,openshift-base-rhel9,openshift-base-rhel8,openshift-enterprise-base-rhel9,openshift-enterprise-base',
-        '4.14': 'openshift-base-rhel9,openshift-base-nodejs,openshift-base-rhel8,openshift-enterprise-base-rhel9,openshift-enterprise-base',
-        '4.15': 'openshift-base-rhel9,openshift-base-nodejs,openshift-base-rhel8,openshift-enterprise-base-rhel9,openshift-enterprise-base',
+        '4.13': 'openshift-base-nodejs,openshift-base-rhel8,openshift-base-rhel9,openshift-enterprise-base-rhel9,openshift-enterprise-base',
+        '4.14': 'openshift-base-nodejs,openshift-base-rhel8,openshift-base-rhel9,openshift-enterprise-base-rhel9,openshift-enterprise-base',
+        '4.15': 'openshift-base-rhel8,openshift-base-rhel9,openshift-enterprise-base-rhel9,openshift-enterprise-base,openshift-base-nodejs',
         '4.16': 'openshift-base-nodejs.rhel9,openshift-base-rhel8,openshift-base-rhel9,openshift-enterprise-base-rhel9,openshift-enterprise-base',
         '4.17': 'openshift-base-nodejs.rhel9,openshift-base-rhel8,openshift-base-rhel9,openshift-enterprise-base-rhel9,openshift-enterprise-base',
         '4.18': 'openshift-base-nodejs.rhel9,openshift-base-rhel9,openshift-enterprise-base-rhel9',
@@ -26,8 +27,10 @@ node() {
     for ( version in commonlib.ocp4Versions ) {
         def cv = "${version}" // make sure we use a locally scoped variable
         // Fall back to 4.19 if we did not manage the above list
-        def images = base_images['4.19']
-        if (cv in base_images) { images = base_images[cv] }
+        def images = base_images[cv]
+	if (!(images)) {
+	    images = base_images["4.20"]
+	}
 
         // Trigger ocp4 plashet build for test assembly in ${version}
         jobs["plashets-v${version}"] = {