fix for do288-v4.18

inventory.yml

@@ -11,8 +11,8 @@ all:
 
   vars:
     # OpenShift versions.
-    ocp_maj: "4.14"
-    ocp_z: "4.14.12"
+    ocp_maj: "4.18"
+    ocp_z: "4.18.6"
 
     # These are the tools we need, some also need to be downloaded.
     tools:
@@ -24,8 +24,52 @@ all:
     # This is the package manifest we need.
     vrfy_cat: redhat-operators
     vrfy_pkg: amq-streams
+    vrfy_chn: amq-streams-2.8.x
     vrfy_csv: amqstreams.v2.8.0-0
 
+    removed_operators:
+      - sub_nspc: openshift-operators
+        sub_name: openshift-pipelines-operator
+        csv_name: openshift-pipelines-operator-rh.v1.18.1
+        pre_cleanup:
+          - kind: openshiftpipelinesascodes
+            apiv: operator.tekton.dev/v1alpha1
+          - kind: tektonaddons
+            apiv: operator.tekton.dev/v1alpha1
+          - kind: tektonchains
+            apiv: operator.tekton.dev/v1alpha1
+          - kind: tektonconfigs
+            apiv: operator.tekton.dev/v1alpha1
+          - kind: tektonhubs
+            apiv: operator.tekton.dev/v1alpha1
+          - kind: tektoninstallersets
+            apiv: operator.tekton.dev/v1alpha1
+          - kind: tektonpipelines
+            apiv: operator.tekton.dev/v1alpha1
+          - kind: tektonresults
+            apiv: operator.tekton.dev/v1alpha1
+          - kind: tektontriggers
+            apiv: operator.tekton.dev/v1alpha1
+        add_cleanup:
+          - openshiftpipelinesascodes.operator.tekton.dev
+          - tektonaddons.operator.tekton.dev
+          - tektonchains.operator.tekton.dev
+          - tektonconfigs.operator.tekton.dev
+          - tektonhubs.operator.tekton.dev
+          - tektoninstallersets.operator.tekton.dev
+          - tektonpipelines.operator.tekton.dev
+          - tektonresults.operator.tekton.dev
+          - tektontriggers.operator.tekton.dev
+
+    added_operators:
+      - catalog: redhat-operators
+        package: amq-streams
+        channel: amq-streams-2.8.x
+        namespace: amq-streams
+        desired_csv: amqstreams.v2.8.0-0
+        og_namespaces: []
+        approval: Manual
+
     # The list of OpenShift clusters check-env will try to connect to.
     clusters:
       - ocp4

pre-flight.yml

@@ -5,9 +5,36 @@
   become: no
   collections:
     - p0f.operators
-  roles:
-    - role: check-env
+  tasks:
+    - include_role:
+        name: check-env
+        apply:
+          tags: check
       tags: check
-    - role: fix-operators
+
+    - include_role:
+        name: fix-operators
+        apply:
+          tags: fix
       tags: fix
+
+    - include_role:
+        name: remove-operators
+        apply:
+          tags: remove
+      loop: "{{ removed_operators }}"
+      loop_control:
+        loop_var: role
+      tags: remove
+
+    - include_role:
+        name: deploy_operators
+        apply:
+          tags: deploy
+      loop: "{{ added_operators }}"
+      loop_control:
+        loop_var: role
+      tags: deploy
+
+  # TODO: deploy vscode / codium ?
 ...

roles/check-env/tasks/main.yml

@@ -48,11 +48,14 @@
 
 # XXX This won't do if you install it using pip.
 # TODO Move this to vars or defaults or something
-- name: We also need python3.11-jmespath
+- name: We also need python3-jmespath
   become: yes
   package:
-    name: python3.11-jmespath
+    name: "{{ item }}"
     state: latest
+  loop:
+    - python3.9-jmespath
+    - python3.11-jmespath
 
 - name: We need some additional collections as well.
   become: yes