4.12 fixes

RHFieldProductManagement · Jan 20, 2023 · ab804bd · ab804bd
1 parent 6af0ca5
commit ab804bd
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 18 deletions.
diff --git a/files/lab/Dockerfile b/files/lab/Dockerfile
@@ -2,8 +2,8 @@ FROM quay.io/openshifthomeroom/workshop-dashboard:latest
 
 USER root
 
-ADD https://mirror.openshift.com/pub/openshift-v4/clients/ocp/latest-4.9/openshift-client-linux.tar.gz /opt/app-root/bin/
-ADD https://github.com/kubevirt/kubevirt/releases/download/v0.50.0/virtctl-v0.50.0-linux-amd64 /opt/app-root/bin/virtctl
+ADD https://mirror.openshift.com/pub/openshift-v4/clients/ocp/latest-4.12/openshift-client-linux.tar.gz /opt/app-root/bin/
+ADD https://github.com/kubevirt/kubevirt/releases/download/v0.58.0/virtctl-v0.58.0-linux-amd64 /opt/app-root/bin/virtctl
 
 COPY . /tmp/src
 

diff --git a/files/lab/build-template.yaml b/files/lab/build-template.yaml
@@ -16,7 +16,7 @@ parameters:
     value: bookbag
   - name: BUILDER_IMAGE
     required: true
-    value: quay.io/roxenham/cnv-workbook:latest
+    value: quay.io/hgeaydem/cnv-workbook:latest
   - name: GIT_REPO
     value: https://github.com/RHFieldProductManagement/openshift-aio.git
 

diff --git a/files/lab/workshop/content/validation.md b/files/lab/workshop/content/validation.md
@@ -51,7 +51,7 @@ Then you should see the following (your minor version may be different, but shou
 
 ~~~bash
 NAME      VERSION   AVAILABLE   PROGRESSING   SINCE   STATUS
-version   4.9.23     True        False         27m     Cluster version is 4.9.23
+version   4.12.0     True        False         27m     Cluster version is 4.12.0
 ~~~
 
 After that check the cluster operators:
@@ -64,17 +64,17 @@ This command will list the all cluster operators, the main components of OpenShi
 
 ~~~bash
 NAME                                       VERSION   AVAILABLE   PROGRESSING   DEGRADED   SINCE   MESSAGE
-authentication                             4.9.23    True        False         False      6h19m
-baremetal                                  4.9.23    True        False         False      6h40m
-cloud-controller-manager                   4.9.23    True        False         False      6h42m
-cloud-credential                           4.9.23    True        False         False      6h54m
-cluster-autoscaler                         4.9.23    True        False         False      6h40m
-config-operator                            4.9.23    True        False         False      6h42m
-console                                    4.9.23    True        False         False      6h23m
-csi-snapshot-controller                    4.9.23    True        False         False      6h41m
-dns                                        4.9.23    True        False         False      6h40m
-etcd                                       4.9.23    True        False         False      6h40m
-image-registry                             4.9.23    True        False         False      6h17m
+authentication                             4.12.0    True        False         False      6h19m
+baremetal                                  4.12.0    True        False         False      6h40m
+cloud-controller-manager                   4.12.0    True        False         False      6h42m
+cloud-credential                           4.12.0    True        False         False      6h54m
+cluster-autoscaler                         4.12.0    True        False         False      6h40m
+config-operator                            4.12.0    True        False         False      6h42m
+console                                    4.12.0    True        False         False      6h23m
+csi-snapshot-controller                    4.12.0    True        False         False      6h41m
+dns                                        4.12.0    True        False         False      6h40m
+etcd                                       4.12.0    True        False         False      6h40m
+image-registry                             4.12.0    True        False         False      6h17m
 (...)
 ~~~
 

diff --git a/files/lab/workshop/content/welcome.md b/files/lab/workshop/content/welcome.md
@@ -2,7 +2,7 @@ Welcome to the OpenShift Virtualization self-paced lab guide. We've put this tog
 
 **OpenShift Virtualization** is the product name for the Container-native Virtualization operator for OpenShift. This is often referred to as "**CNV**" and is the downstream offering for the upstream [Kubevirt project](https://kubevirt.io/). While some aspects of this lab have references to "CNV", any reference to "CNV", "Container-native Virtualization" and "OpenShift Virtualization" can be *somewhat* used interchangeably.
 
-In these labs you'll utilise a virtual environment built with the [OpenShift AIO](https://github.com/RHFieldProductManagement/openshift-aio) concept that mimics as close as feasibly possible a **real** [baremetal IPI](https://metal3.io/) OpenShift 4.9 deployment. In this hands-on lab you won't need to deploy OpenShift, it's already deployed for you! However, aside from this lab guide, it's a completely empty cluster, ready to be configured and used with OpenShift Virtualization. The default configuration includes a deployment of [OpenShift Data Foundation](https://www.redhat.com/en/technologies/cloud-computing/openshift-data-foundation) (formerly known as OpenShift Container Storage (OCS)) for all storage needs. Additionally, the base infrastructure also has NFS available.
+In these labs you'll utilise a virtual environment built with the [OpenShift AIO](https://github.com/RHFieldProductManagement/openshift-aio) concept that mimics as close as feasibly possible a **real** [baremetal IPI](https://metal3.io/) OpenShift 4.12 deployment. In this hands-on lab you won't need to deploy OpenShift, it's already deployed for you! However, aside from this lab guide, it's a completely empty cluster, ready to be configured and used with OpenShift Virtualization. The default configuration includes a deployment of [OpenShift Data Foundation](https://www.redhat.com/en/technologies/cloud-computing/openshift-data-foundation) (formerly known as OpenShift Container Storage (OCS)) for all storage needs. Additionally, the base infrastructure also has NFS available.
 
 This is the self-hosted lab guide that will run you through the following topics:
 

diff --git a/tasks/main.yml b/tasks/main.yml
@@ -43,10 +43,30 @@
     delay: 30
     until: buildt_success is not failed
 
+  - name: Create the latest tag
+    shell: >-
+      oc tag quay.io/hgeaydem/cnv-workbook:latest cnv:latest
+    register: tag_success
+    retries: 3
+    delay: 30
+    until: tag_success is not failed
+
+  - name: Create the latest tag (namespaced)
+    shell: >-
+      oc tag quay.io/hgeaydem/cnv-workbook:latest cnv:latest -n workbook
+    register: tag_success
+    retries: 3
+    delay: 30
+    until: tag_success is not failed
+
   - name: Start the build
-    shell: oc -n workbook start-build cnv --from-dir=/root/cnvlab/files/lab
+    shell: |
+      oc tag -d cnv:latest
+      oc tag quay.io/hgeaydem/cnv-workbook:latest cnv:latest
+      oc tag quay.io/hgeaydem/cnv-workbook:latest cnv:latest -n workbook
+      oc -n workbook start-build cnv --from-dir=/root/cnvlab/files/lab
     register: build_success
-    retries: 3
+    retries: 10
     delay: 30
     until: build_success is not failed