NO-ISSUE: Change default release image to 4.9 (openshift#3153)

oourfali · Jan 4, 2022 · 6ed9f69 · 6ed9f69
1 parent ca9a803
commit 6ed9f69
Showing 6 changed files with 10 additions and 9 deletions.
diff --git a/Makefile b/Makefile
@@ -113,10 +113,11 @@ DEFAULT_OS_IMAGES = $(shell (tr -d '\n\t ' < ${ROOT_DIR}/data/default_os_images.
 # Support all Release/OS images for CI
 ifeq ($(CI), true)
 	VERBOSE = true
-	RELEASE_IMAGES := $(or ${RELEASE_IMAGES},${DEFAULT_RELEASE_IMAGES})
-	OS_IMAGES := $(or ${OS_IMAGES},${DEFAULT_OS_IMAGES})
 endif
 
+RELEASE_IMAGES := $(or ${RELEASE_IMAGES},${DEFAULT_RELEASE_IMAGES})
+OS_IMAGES := $(or ${OS_IMAGES},${DEFAULT_OS_IMAGES})
+
 # Support default Release/OS image if lists not specified.
 # I.e. used on local deployments for using a single image,
 # instead of using all images as in CI.

diff --git a/config/onprem-iso-config.ign b/config/onprem-iso-config.ign
@@ -29,7 +29,7 @@
         "path": "/etc/assisted-service/environment",
         "contents": {
           "compression": "gzip",
-          "source": "data:;base64,H4sIAAAAAAAC/7yWX2+bOh/H73kZvgZjCCOAxAVNUBopbTIgnaZHleWBk1gFzGM7PeuZ+t6PnH9Lu56qWc5yYYmff8D340+CYTbNi1GW5p8neJgUyVWSpzFrpSJ1TYVx1J0lef5lmg1jUjWsPe7M8zTbzQ6v8PU0L2LH7UMEEXT0zGyaFfEnr+fq4uXJ+qY/q9vk5jg8T7O78SDFmgnPs0m8UqqTkW0TKZlUtLJIx2DNS1JD3tFWrthCQcajwPN6xjCdTaZfcZFko7SIedsJ2hh5Mc2SURovWE3lk1R6apcySPAgzQo8S4rr2K6IIna7ZO13S9J6IdmypRUshTKmOR7fJKM0j//3Axxi8SMVkvEWRMCDPjBB2a0xEeWKKVqqtaAgAt8DH/seMMFa1CAC+9U0TAgujlZQ8sbu1t/sw4z16NkV7Whb0bZkVNpiVXJpe9DXAwbb2tocW9sUq2aPFG6PIZMcmEBwrhYS/6FwnWdtIw6xzRKY4EiMDwMXushFjos+OYGLLASezX+z2L+Uxb4esNc7aNTF5Ty+iv+IyD4MPC3SQaHrOUHPeVdkcCmRgR7Q8Q4idXE5ka/iPyIyeCEyRO+LDC8lMtQDooPHEKLLaXwZ/hGL4d6ig1DgeKj/OxaJaH5bItH38k+Qubtga3NXnK/zLIy95APNu5ZR6G0s3xtZOkn1C/K/eSn9f02eIONH6xK0pkRSq6KPNi+7fR3pzd/xrcP1L7Kg45+9s5+C0oe98G0U3Tl7bzwFJYCu9zaK7gATVHRB1rUCkRJreu5mcwpZCB3nbTLdOfeJPZlk90d/E+XemM2vJuMBHkxvi2R8m2Y4S0fjvMjGaR7voozx7M7H+Xy2+cDUNo1kXlzj4ussjVveUuP6C75LJuNhUkz1DT7Px1l6k94Wm8fkZ+r+FzFBQ6SiAkQ/NustuaASRJ4JBGlww76ByPF7gWeCiskHLNnfFC/1pItMsPtuJYrxFm/7HaUVVitB5YrXFW4kiBxkgpaqv7h4wDVRtC2ffjkDmaAj5QNVuOZS4o6KkraKLCmI0LMJ9LW/MLpHjIETun8a8R1GR0PKlr8iDI4Ie27fD85CfH6+N/4JAAD//61WzfW7DAAA"
+          "source": "data:;base64,H4sIAAAAAAAC/7yWX2+jOBfG7/kYvgZjCEMAiQvaoDRS2mSAdDR6VVkecBKrgHltpzvdUb77yvk3aadbNZOdXFjinIP9POcnODCd5MUwS/PPYzxIiuQqydOYtVKRuqbCOKpOkzz/MskGMaka1h5XZnma7bKDK3wzyYvYcfsQQQQdnZlOsiL+5PVcHby8WR/6M7pLbo/F8zS7H12nWHvCs2wcL5XqZGTbREomFa0s0jFY85LUkHe0lUs2V5DxKPC8njFIp+PJV1wk2TAtYt52gjZGXkyyZJjGc1ZT+SyVTu1UrhN8nWYFnibFTWxXRBG7XbD2uyVpPZds0dIKlkIZkxyPbpNhmsf/+wEOsviJCsl4CyLgQR+YoOxWmIhyyRQt1UpQEIHvgY99D5hgJWoQgX03DROCi6MOSt7Y3eqbfchYT55d0Y62FW1LRqUtliWXtgd9vWCwja3NtbVVsWr2ROH2GjLJgQkE52ou8R8S13rWVuIg2yyACY7A+DBwoYtc5LjokxO4yEJgbf4bxf6lKPb1gr3eAaMOLsfxlfxHQPZh4GmQDgpdzwl6zrsgg0uBDPSCjncAqYPLgXwl/xGQwQuQIXofZHgpkKFeEB04hhBdDuNL8Y9QDPcUHYQCx0P936FIRPPbEIk+yz8B5m7DluYuOB/nWTb2kA9u3qWMQm9D+cHI0nGqP5D/zUfp/yvyDBk/6kvQmhJJrYo+2bzs9nGkh7/jW4f9L7Sg45892U+x0oe98G0runL2bDzFSgBd720runL2dDnFSggd520rugJMUNE5WdUKREqs6Jlv7MnGdg/6W87WD8Z0djUeXePryV2RjO7SDGfpcJQX2SjN452UMZre+zifTTc/mLoFI5kVN7j4Ok3jlrfUuPmC75PxaJAUE33A59koS2/Tu2LzmvxU3WMwQUOkogJEPzb9llxQCSLPBII0uGHfQOT4vcAzQcXkI5bsb4oXOukiE+z+W4livMXbekdphdVSULnkdYUbCSIHmaCl6i8uHnFNFG3L51/uQCboSPlIFa65lLijoqStIgsKIrQ2gd77i0f3yGPghO6ftviOR0eblC1/5TA4cthz+35wlsX1+sH4JwAA//+6F3xquwwAAA=="
         },
         "mode": 420
       },

diff --git a/config/onprem-iso-fcc.yaml b/config/onprem-iso-fcc.yaml
@@ -128,7 +128,7 @@ storage:
                 STORAGE=filesystem
                 SERVICE_CA_CERT_PATH=/data/nginx-selfsigned.crt
                 OS_IMAGES=[{"openshift_version":"4.6","cpu_architecture":"x86_64","url":"https://mirror.openshift.com/pub/openshift-v4/dependencies/rhcos/4.6/4.6.8/rhcos-4.6.8-x86_64-live.x86_64.iso","rootfs_url":"https://mirror.openshift.com/pub/openshift-v4/dependencies/rhcos/4.6/4.6.8/rhcos-live-rootfs.x86_64.img","version":"46.82.202012051820-0"},{"openshift_version":"4.7","cpu_architecture":"x86_64","url":"https://mirror.openshift.com/pub/openshift-v4/dependencies/rhcos/4.7/4.7.33/rhcos-4.7.33-x86_64-live.x86_64.iso","rootfs_url":"https://mirror.openshift.com/pub/openshift-v4/dependencies/rhcos/4.7/4.7.33/rhcos-live-rootfs.x86_64.img","version":"47.84.202109241831-0"},{"openshift_version":"4.8","cpu_architecture":"x86_64","url":"https://mirror.openshift.com/pub/openshift-v4/dependencies/rhcos/4.8/4.8.14/rhcos-4.8.14-x86_64-live.x86_64.iso","rootfs_url":"https://mirror.openshift.com/pub/openshift-v4/dependencies/rhcos/4.8/4.8.14/rhcos-live-rootfs.x86_64.img","version":"48.84.202109241901-0"},{"openshift_version":"4.9","cpu_architecture":"x86_64","url":"https://mirror.openshift.com/pub/openshift-v4/dependencies/rhcos/4.9/4.9.0/rhcos-4.9.0-x86_64-live.x86_64.iso","rootfs_url":"https://mirror.openshift.com/pub/openshift-v4/dependencies/rhcos/4.9/4.9.0/rhcos-live-rootfs.x86_64.img","version":"49.84.202110081407-0"},{"openshift_version":"4.9","cpu_architecture":"arm64","url":"https://mirror.openshift.com/pub/openshift-v4/aarch64/dependencies/rhcos/4.9/4.9.0/rhcos-4.9.0-aarch64-live.aarch64.iso","rootfs_url":"https://mirror.openshift.com/pub/openshift-v4/aarch64/dependencies/rhcos/4.9/4.9.0/rhcos-4.9.0-aarch64-live-rootfs.aarch64.img","version":"49.84.202110080947-0"}]
-                RELEASE_IMAGES=[{"openshift_version":"4.6","cpu_architecture":"x86_64","url":"quay.io/openshift-release-dev/ocp-release:4.6.16-x86_64","version":"4.6.16"},{"openshift_version":"4.7","cpu_architecture":"x86_64","url":"quay.io/openshift-release-dev/ocp-release:4.7.39-x86_64","version":"4.7.39"},{"openshift_version":"4.8","cpu_architecture":"x86_64","url":"quay.io/openshift-release-dev/ocp-release:4.8.24-x86_64","version":"4.8.24","default":true},{"openshift_version":"4.9","cpu_architecture":"x86_64","url":"quay.io/openshift-release-dev/ocp-release:4.9.11-x86_64","version":"4.9.11"},{"openshift_version":"4.9","cpu_architecture":"arm64","url":"quay.io/openshift-release-dev/ocp-release:4.9.11-aarch64","version":"4.9.11"}]
+                RELEASE_IMAGES=[{"openshift_version":"4.6","cpu_architecture":"x86_64","url":"quay.io/openshift-release-dev/ocp-release:4.6.16-x86_64","version":"4.6.16"},{"openshift_version":"4.7","cpu_architecture":"x86_64","url":"quay.io/openshift-release-dev/ocp-release:4.7.39-x86_64","version":"4.7.39"},{"openshift_version":"4.8","cpu_architecture":"x86_64","url":"quay.io/openshift-release-dev/ocp-release:4.8.24-x86_64","version":"4.8.24"},{"openshift_version":"4.9","cpu_architecture":"x86_64","url":"quay.io/openshift-release-dev/ocp-release:4.9.11-x86_64","version":"4.9.11","default":true},{"openshift_version":"4.9","cpu_architecture":"arm64","url":"quay.io/openshift-release-dev/ocp-release:4.9.11-aarch64","version":"4.9.11"}]
                 PUBLIC_CONTAINER_REGISTRIES=quay.io
                 IPV6_SUPPORT=true
                 AUTH_TYPE=none

diff --git a/data/default_release_images.json b/data/default_release_images.json
@@ -15,14 +15,14 @@
         "openshift_version": "4.8",
         "cpu_architecture": "x86_64",
         "url": "quay.io/openshift-release-dev/ocp-release:4.8.24-x86_64",
-        "version": "4.8.24",
-        "default": true
+        "version": "4.8.24"
     },
     {
         "openshift_version": "4.9",
         "cpu_architecture": "x86_64",
         "url": "quay.io/openshift-release-dev/ocp-release:4.9.11-x86_64",
-        "version": "4.9.11"
+        "version": "4.9.11",
+        "default": true
     },
     {
         "openshift_version": "4.9",

diff --git a/onprem-environment b/onprem-environment
@@ -15,7 +15,7 @@ DEPLOY_TARGET=onprem
 STORAGE=filesystem
 DUMMY_IGNITION=false
 OS_IMAGES=[{"openshift_version":"4.6","cpu_architecture":"x86_64","url":"https://mirror.openshift.com/pub/openshift-v4/dependencies/rhcos/4.6/4.6.8/rhcos-4.6.8-x86_64-live.x86_64.iso","rootfs_url":"https://mirror.openshift.com/pub/openshift-v4/dependencies/rhcos/4.6/4.6.8/rhcos-live-rootfs.x86_64.img","version":"46.82.202012051820-0"},{"openshift_version":"4.7","cpu_architecture":"x86_64","url":"https://mirror.openshift.com/pub/openshift-v4/dependencies/rhcos/4.7/4.7.33/rhcos-4.7.33-x86_64-live.x86_64.iso","rootfs_url":"https://mirror.openshift.com/pub/openshift-v4/dependencies/rhcos/4.7/4.7.33/rhcos-live-rootfs.x86_64.img","version":"47.84.202109241831-0"},{"openshift_version":"4.8","cpu_architecture":"x86_64","url":"https://mirror.openshift.com/pub/openshift-v4/dependencies/rhcos/4.8/4.8.14/rhcos-4.8.14-x86_64-live.x86_64.iso","rootfs_url":"https://mirror.openshift.com/pub/openshift-v4/dependencies/rhcos/4.8/4.8.14/rhcos-live-rootfs.x86_64.img","version":"48.84.202109241901-0"},{"openshift_version":"4.9","cpu_architecture":"x86_64","url":"https://mirror.openshift.com/pub/openshift-v4/dependencies/rhcos/4.9/4.9.0/rhcos-4.9.0-x86_64-live.x86_64.iso","rootfs_url":"https://mirror.openshift.com/pub/openshift-v4/dependencies/rhcos/4.9/4.9.0/rhcos-live-rootfs.x86_64.img","version":"49.84.202110081407-0"},{"openshift_version":"4.9","cpu_architecture":"arm64","url":"https://mirror.openshift.com/pub/openshift-v4/aarch64/dependencies/rhcos/4.9/4.9.0/rhcos-4.9.0-aarch64-live.aarch64.iso","rootfs_url":"https://mirror.openshift.com/pub/openshift-v4/aarch64/dependencies/rhcos/4.9/4.9.0/rhcos-4.9.0-aarch64-live-rootfs.aarch64.img","version":"49.84.202110080947-0"}]
-RELEASE_IMAGES=[{"openshift_version":"4.6","cpu_architecture":"x86_64","url":"quay.io/openshift-release-dev/ocp-release:4.6.16-x86_64","version":"4.6.16"},{"openshift_version":"4.7","cpu_architecture":"x86_64","url":"quay.io/openshift-release-dev/ocp-release:4.7.39-x86_64","version":"4.7.39"},{"openshift_version":"4.8","cpu_architecture":"x86_64","url":"quay.io/openshift-release-dev/ocp-release:4.8.24-x86_64","version":"4.8.24","default":true},{"openshift_version":"4.9","cpu_architecture":"x86_64","url":"quay.io/openshift-release-dev/ocp-release:4.9.11-x86_64","version":"4.9.11"},{"openshift_version":"4.9","cpu_architecture":"arm64","url":"quay.io/openshift-release-dev/ocp-release:4.9.11-aarch64","version":"4.9.11"}]
+RELEASE_IMAGES=[{"openshift_version":"4.6","cpu_architecture":"x86_64","url":"quay.io/openshift-release-dev/ocp-release:4.6.16-x86_64","version":"4.6.16"},{"openshift_version":"4.7","cpu_architecture":"x86_64","url":"quay.io/openshift-release-dev/ocp-release:4.7.39-x86_64","version":"4.7.39"},{"openshift_version":"4.8","cpu_architecture":"x86_64","url":"quay.io/openshift-release-dev/ocp-release:4.8.24-x86_64","version":"4.8.24"},{"openshift_version":"4.9","cpu_architecture":"x86_64","url":"quay.io/openshift-release-dev/ocp-release:4.9.11-x86_64","version":"4.9.11","default":true},{"openshift_version":"4.9","cpu_architecture":"arm64","url":"quay.io/openshift-release-dev/ocp-release:4.9.11-aarch64","version":"4.9.11"}]
 ENABLE_SINGLE_NODE_DNSMASQ=true
 DISK_ENCRYPTION_SUPPORT=true
 PUBLIC_CONTAINER_REGISTRIES=quay.io

diff --git a/openshift/template.yaml b/openshift/template.yaml
@@ -17,7 +17,7 @@ parameters:
   value: '[{"openshift_version":"4.6","cpu_architecture":"x86_64","url":"https://mirror.openshift.com/pub/openshift-v4/dependencies/rhcos/4.6/4.6.8/rhcos-4.6.8-x86_64-live.x86_64.iso","rootfs_url":"https://mirror.openshift.com/pub/openshift-v4/dependencies/rhcos/4.6/4.6.8/rhcos-live-rootfs.x86_64.img","version":"46.82.202012051820-0"},{"openshift_version":"4.7","cpu_architecture":"x86_64","url":"https://mirror.openshift.com/pub/openshift-v4/dependencies/rhcos/4.7/4.7.33/rhcos-4.7.33-x86_64-live.x86_64.iso","rootfs_url":"https://mirror.openshift.com/pub/openshift-v4/dependencies/rhcos/4.7/4.7.33/rhcos-live-rootfs.x86_64.img","version":"47.84.202109241831-0"},{"openshift_version":"4.8","cpu_architecture":"x86_64","url":"https://mirror.openshift.com/pub/openshift-v4/dependencies/rhcos/4.8/4.8.14/rhcos-4.8.14-x86_64-live.x86_64.iso","rootfs_url":"https://mirror.openshift.com/pub/openshift-v4/dependencies/rhcos/4.8/4.8.14/rhcos-live-rootfs.x86_64.img","version":"48.84.202109241901-0"},{"openshift_version":"4.9","cpu_architecture":"x86_64","url":"https://mirror.openshift.com/pub/openshift-v4/dependencies/rhcos/4.9/4.9.0/rhcos-4.9.0-x86_64-live.x86_64.iso","rootfs_url":"https://mirror.openshift.com/pub/openshift-v4/dependencies/rhcos/4.9/4.9.0/rhcos-live-rootfs.x86_64.img","version":"49.84.202110081407-0"},{"openshift_version":"4.9","cpu_architecture":"arm64","url":"https://mirror.openshift.com/pub/openshift-v4/aarch64/dependencies/rhcos/4.9/4.9.0/rhcos-4.9.0-aarch64-live.aarch64.iso","rootfs_url":"https://mirror.openshift.com/pub/openshift-v4/aarch64/dependencies/rhcos/4.9/4.9.0/rhcos-4.9.0-aarch64-live-rootfs.aarch64.img","version":"49.84.202110080947-0"}]' # os images
   required: false
 - name: RELEASE_IMAGES
-  value: '[{"openshift_version":"4.6","cpu_architecture":"x86_64","url":"quay.io/openshift-release-dev/ocp-release:4.6.16-x86_64","version":"4.6.16"},{"openshift_version":"4.7","cpu_architecture":"x86_64","url":"quay.io/openshift-release-dev/ocp-release:4.7.39-x86_64","version":"4.7.39"},{"openshift_version":"4.8","cpu_architecture":"x86_64","url":"quay.io/openshift-release-dev/ocp-release:4.8.24-x86_64","version":"4.8.24","default":true},{"openshift_version":"4.9","cpu_architecture":"x86_64","url":"quay.io/openshift-release-dev/ocp-release:4.9.11-x86_64","version":"4.9.11"},{"openshift_version":"4.9","cpu_architecture":"arm64","url":"quay.io/openshift-release-dev/ocp-release:4.9.11-aarch64","version":"4.9.11"}]' # release images
+  value: '[{"openshift_version":"4.6","cpu_architecture":"x86_64","url":"quay.io/openshift-release-dev/ocp-release:4.6.16-x86_64","version":"4.6.16"},{"openshift_version":"4.7","cpu_architecture":"x86_64","url":"quay.io/openshift-release-dev/ocp-release:4.7.39-x86_64","version":"4.7.39"},{"openshift_version":"4.8","cpu_architecture":"x86_64","url":"quay.io/openshift-release-dev/ocp-release:4.8.24-x86_64","version":"4.8.24"},{"openshift_version":"4.9","cpu_architecture":"x86_64","url":"quay.io/openshift-release-dev/ocp-release:4.9.11-x86_64","version":"4.9.11","default":true},{"openshift_version":"4.9","cpu_architecture":"arm64","url":"quay.io/openshift-release-dev/ocp-release:4.9.11-aarch64","version":"4.9.11"}]' # release images
   required: false
 - name: MUST_GATHER_IMAGES
   value: '{"4.7":{"cnv":"registry.redhat.io/container-native-virtualization/cnv-must-gather-rhel8:v2.6.5","ocs":"registry.redhat.io/ocs4/ocs-must-gather-rhel8","lso":"registry.redhat.io/openshift4/ose-local-storage-mustgather-rhel8"},"4.8":{"cnv":"registry.redhat.io/container-native-virtualization/cnv-must-gather-rhel8:v2.6.5","ocs":"registry.redhat.io/ocs4/ocs-must-gather-rhel8","lso":"registry.redhat.io/openshift4/ose-local-storage-mustgather-rhel8"},"4.9":{"cnv":"registry.redhat.io/container-native-virtualization/cnv-must-gather-rhel8:v2.6.5","ocs":"registry.redhat.io/ocs4/ocs-must-gather-rhel8","lso":"registry.redhat.io/openshift4/ose-local-storage-mustgather-rhel8"}}' # must-gather images