Merge branch 'main' into shiftstack-resources

Author: rlobillo

roles/test_operator/tasks/run-test-operator-job.yml

@@ -111,6 +111,7 @@
         api_key: "{{ cifmw_openshift_token | default(omit)}}"
         context: "{{ cifmw_openshift_context | default(omit)}}"
         state: present
+        wait: true
         definition:
           apiVersion: v1
           kind: Pod

zuul.d/edpm_periodic.yaml

@@ -43,24 +43,6 @@
       registry_login_enabled: true
       cifmw_dlrn_report_result: true
 
-- job:
-    name: periodic-watcher-operator-validation-master
-    parent: watcher-operator-base
-    required-projects:
-      - openstack-k8s-operators/watcher-operator
-    vars:
-      <<: *edpm_multinode_vars
-      fetch_dlrn_hash: true
-      watcher_dlrn_tag: "{{ cifmw_repo_setup_promotion }}"
-      watcher_registry_url: quay.rdoproject.org/podified-master-centos9
-      cifmw_update_containers_openstack: true
-      # ensure we override the hook to deploy watcher so we can set the right
-      # content for the master pipeline
-      post_deploy:
-        - name: Deploy watcher service
-          type: playbook
-          source: "{{ watcher_hook }}"
-
 # Antelope jobs
 - job:
     name: periodic-podified-edpm-deployment-antelope-ocp-crc-1cs9