Merge "CI: Remove bits related to monitoring testing"

Author: Microzuul CI

playbooks/group_vars/all.yaml

@@ -12,13 +12,11 @@ validate_certs: false
 zuul_endpoint: "{{ fqdn }}/zuul"
 logserver_endpoint: "{{ fqdn }}/logs"
 nodepool_endpoint: "{{ fqdn }}/nodepool"
-prometheus_host: "prometheus.{{ fqdn }}"
 gerrit_host: "gerrit.{{ fqdn }}"
 
 hosts:
   - "{{ fqdn }}"
   - "{{ gerrit_host }}"
-  - "{{ prometheus_host }}"
 
 logserver_copy_content_dest: "/tmp/logserver-content"
 

playbooks/vars/global.yaml

@@ -2,5 +2,4 @@ install_requirements: false
 os_host: "{{ microshift_host }}"
 remote_os_host: true
 src_dir: "/tmp/sf-operator"
-zuul: { "project": { "src_dir": ".." } }
-test_monitoring: "false"
+zuul: { "project": { "src_dir": ".." } }

roles/health-check/test-monitoring/defaults/main.yaml

@@ -1,3 +1,2 @@
 ---
 microshift_host: "microshift.dev"
-test_monitoring: false

roles/health-check/test-monitoring/files/clouds.yaml

@@ -39,8 +39,6 @@
     - name: test-cert-manager-letsencrypt
       when: "{{ mode == 'olm' }}"
     - name: zuul-client-api
-    - name: test-monitoring
-      when: "{{ test_monitoring == 'true' }}"
     - name: zuul-components
     - name: test-log-forwarding
     - name: backup

roles/health-check/test-monitoring/tasks/main.yaml

@@ -39,7 +39,6 @@
         - 199.204.44.24
         - 199.204.47.54
       inject_dev_ssh_keys: true
-      test_monitoring: "false"
 
 - job:
     name: sf-operator-multinode