Merge branch 'master' into alexy_chargeback_fvt

Author: elfiesmelfie

.zuul.yaml

@@ -169,13 +169,7 @@
             override-checkout: main
         - feature-verification-tests-noop:
             files: *irrelevant_files
-        - functional-tests-osp18:
-            files:
-              - roles/telemetry_autoscaling/.*
-              - roles/telemetry_graphing/.*
-              - roles/telemetry_logging/.*
-              - roles/common/*
-              - roles/telemetry_verify_metrics/.*
+        - functional-tests-osp18
         - functional-logging-tests-osp18:
             irrelevant-files: *irrelevant_files
             files:

ci/vars-use-master-containers.yml

@@ -1,4 +1,4 @@
 ---
-pre_tests_99_modify_openstackversions:
+post_ctlplane_deploy_99_modify_openstackversions:
   source: "{{ ansible_user_dir }}/{{ zuul.projects['github.com/infrawatch/feature-verification-tests'].src_dir }}/ci/use-master-containers.yml"
   type: playbook