Merge "Set prometheus monitoring for feature tests"

diff --git a/jjb/airship/job_feature_tests_centos.yml b/jjb/airship/job_feature_tests_centos.yml
index f579218869ca7627f8fa81228a06921e07b16b8c..88a3af3d418ee8c6893e64f9cffba709192ece86 100644 (file)
--- a/jjb/airship/job_feature_tests_centos.yml
+++ b/jjb/airship/job_feature_tests_centos.yml
@@ -81,6 +81,10 @@
         name: TESTS_FOR
         default: "feature_tests_centos"
         description: 'Tests for pivoting and remediation.'
+    - string:
+        name: PROMETHEUS_MONITORING
+        default: "true"
+        description: 'Enable Prometheus metrics'
 
     properties:
     - build-discarder:

diff --git a/jjb/airship/job_feature_tests_ubuntu.yml b/jjb/airship/job_feature_tests_ubuntu.yml
index 3036cef98fc946e761456b95b6ebcb484e74594a..c3037227baa44d853d9d6bc4f020413c6c7c93a2 100644 (file)
--- a/jjb/airship/job_feature_tests_ubuntu.yml
+++ b/jjb/airship/job_feature_tests_ubuntu.yml
@@ -81,6 +81,10 @@
         name: TESTS_FOR
         default: "feature_tests"
         description: 'Tests for pivoting and remediation.'
+    - string:
+        name: PROMETHEUS_MONITORING
+        default: "true"
+        description: 'Enable Prometheus metrics'
 
     properties:
     - build-discarder:

diff --git a/jjb/airship/job_feature_tests_upgrade_ubuntu.yml b/jjb/airship/job_feature_tests_upgrade_ubuntu.yml
index a93a36ce34e66560259112d000bd3ab5f672ffb9..b64d50b35aca34289176a3c8c2c529da442db5eb 100644 (file)
--- a/jjb/airship/job_feature_tests_upgrade_ubuntu.yml
+++ b/jjb/airship/job_feature_tests_upgrade_ubuntu.yml
@@ -81,6 +81,10 @@
         name: TESTS_FOR
         default: "feature_tests_upgrade"
         description: 'Tests for upgrade.'
+    - string:
+        name: PROMETHEUS_MONITORING
+        default: "true"
+        description: 'Enable Prometheus metrics'
 
     properties:
     - build-discarder:

diff --git a/jjb/airship/job_master_feature_tests_centos.yml b/jjb/airship/job_master_feature_tests_centos.yml
index a5d9184678d967611be1447f788d0aa93333cf4b..b55eaad89e55efb2b6d6e5378079add314ab2998 100644 (file)
--- a/jjb/airship/job_master_feature_tests_centos.yml
+++ b/jjb/airship/job_master_feature_tests_centos.yml
@@ -81,6 +81,10 @@
         name: TESTS_FOR
         default: "feature_tests_centos"
         description: 'Tests for pivoting and remediation.'
+    - string:
+        name: PROMETHEUS_MONITORING
+        default: "true"
+        description: 'Enable Prometheus metrics'
 
     properties:
     - build-discarder:

diff --git a/jjb/airship/job_master_feature_tests_ubuntu.yml b/jjb/airship/job_master_feature_tests_ubuntu.yml
index c2dbbf4c3b1dc52713cf63ae168daf73b42807f1..c9ef2df4cc8fadca77f47cc10615ec5d5683de64 100644 (file)
--- a/jjb/airship/job_master_feature_tests_ubuntu.yml
+++ b/jjb/airship/job_master_feature_tests_ubuntu.yml
@@ -81,6 +81,10 @@
         name: TESTS_FOR
         default: "feature_tests"
         description: 'Tests for pivoting and remediation.'
+    - string:
+        name: PROMETHEUS_MONITORING
+        default: "true"
+        description: 'Enable Prometheus metrics'
 
     properties:
     - build-discarder:

diff --git a/jjb/airship/job_master_feature_tests_upgrade_ubuntu.yml b/jjb/airship/job_master_feature_tests_upgrade_ubuntu.yml
index 24837df5690fe4458477c1e28e10d3b2b9f0d850..729cab0612fc0073a7a118a833f82ca7d206e2ed 100644 (file)
--- a/jjb/airship/job_master_feature_tests_upgrade_ubuntu.yml
+++ b/jjb/airship/job_master_feature_tests_upgrade_ubuntu.yml
@@ -81,6 +81,10 @@
         name: TESTS_FOR
         default: "feature_tests_upgrade"
         description: 'Tests for upgrade.'
+    - string:
+        name: PROMETHEUS_MONITORING
+        default: "true"
+        description: 'Enable Prometheus metrics'
 
     properties:
     - build-discarder: