Disable Prometheus while VM verifications

redhat-performance · Sep 26, 2024 · 638fea1 · 638fea1
1 parent 1aff577
commit 638fea1
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 3 deletions.
diff --git a/benchmark_runner/main/environment_variables.py b/benchmark_runner/main/environment_variables.py
@@ -228,7 +228,7 @@ def __init__(self):
         # For SNO: choose 1 master, dictionary: {'master': ['master-0', 'master-1', 'master-2'], 'worker': ['worker-0', 'worker-1', 'worker-2' ] }
         self._environment_variables_dict['expected_nodes'] = EnvironmentVariables.get_env('EXPECTED_NODES', "")
         # GitHub repository - for credentials updating
-        self._environment_variables_dict['github_repository_short'] = EnvironmentVariables.get_env('GITHUB_REPOSITORY_SHORT', '')
+        self._environment_variables_dict['github_repository_short'] = EnvironmentVariables.get_env('GIT_REPOSITORY_SHORT', '')
 
         # Parameters below related to 'install_resource()'
         # MANDATORY for OCP resource install: True for install resources, default False

diff --git a/jenkins/PerfCI_Chaos/03_PerfCI_Choas_Windows_VMs_Deployment/Jenkinsfile b/jenkins/PerfCI_Chaos/03_PerfCI_Choas_Windows_VMs_Deployment/Jenkinsfile
@@ -18,6 +18,10 @@ pipeline {
         IBM_SECRET_ACCESS_KEY = credentials('perfci_ibm_secret_access_key')
         IBM_BUCKET = credentials('perfci_ibm_bucket')
         IBM_KEY = credentials('perfci_ibm_key')
+        GOOGLE_DRIVE_PATH = credentials('perfci_google_drive_path')
+        GOOGLE_DRIVE_CREDENTIALS = credentials('perfci_google_drive_credentials')
+        GOOGLE_DRIVE_TOKEN = credentials('perfci_google_drive_token')
+        GOOGLE_DRIVE_SHARED_DRIVE_ID = credentials('perfci_google_drive_shared_drive_id')
         RUN_ARTIFACTS_URL = credentials('perfci_run_artifacts_url')
         REDIS = credentials('perfci_redis')
         WORKER_DISK_IDS = credentials('perfci_worker_disk_ids')
@@ -191,6 +195,10 @@ END
                                         -e IBM_SECRET_ACCESS_KEY='${IBM_SECRET_ACCESS_KEY}' \
                                         -e IBM_BUCKET='${IBM_BUCKET}' \
                                         -e IBM_KEY='${IBM_KEY}' \
+                                        -e GOOGLE_DRIVE_PATH='${GOOGLE_DRIVE_PATH}' \
+                                        -e GOOGLE_DRIVE_CREDENTIALS='${GOOGLE_DRIVE_CREDENTIALS}' \
+                                        -e GOOGLE_DRIVE_TOKEN='${GOOGLE_DRIVE_TOKEN}' \
+                                        -e GOOGLE_DRIVE_SHARED_DRIVE_ID='${GOOGLE_DRIVE_SHARED_DRIVE_ID}' \
                                         -e RUN_ARTIFACTS_URL='${RUN_ARTIFACTS_URL}' \
                                         -e BUILD_VERSION='${build_version}' \
                                         -e RUN_TYPE='${RUN_TYPE}' \

diff --git a/jenkins/PerfCI_Chaos/04_PerfCI_Chaos_Upgrade_OpenShift_Deployment/Jenkinsfile b/jenkins/PerfCI_Chaos/04_PerfCI_Chaos_Upgrade_OpenShift_Deployment/Jenkinsfile
@@ -56,7 +56,7 @@ pipeline {
         CONTAINER_KUBECONFIG_PATH = '/home/jenkins/.kube/config'
         WORKER_DISK_PREFIX = 'wwn-0x'
         SAVE_ARTIFACTS_LOCAL = 'False'
-        ENABLE_PROMETHEUS_SNAPSHOT = 'True'
+        ENABLE_PROMETHEUS_SNAPSHOT = 'False'
         DELETE_ALL = 'False' // Not delete the running Windows11 VMs
         VERIFICATION_ONLY = 'True'
         RUN_TYPE = 'perf_ci'

diff --git a/jenkins/PerfCI_Chaos/05_PerfCI_Chaos_Verify_Windows_VMs_Deployment/Jenkinsfile b/jenkins/PerfCI_Chaos/05_PerfCI_Chaos_Verify_Windows_VMs_Deployment/Jenkinsfile
@@ -18,6 +18,10 @@ pipeline {
         IBM_SECRET_ACCESS_KEY = credentials('perfci_ibm_secret_access_key')
         IBM_BUCKET = credentials('perfci_ibm_bucket')
         IBM_KEY = credentials('perfci_ibm_key')
+        GOOGLE_DRIVE_PATH = credentials('perfci_google_drive_path')
+        GOOGLE_DRIVE_CREDENTIALS = credentials('perfci_google_drive_credentials')
+        GOOGLE_DRIVE_TOKEN = credentials('perfci_google_drive_token')
+        GOOGLE_DRIVE_SHARED_DRIVE_ID = credentials('perfci_google_drive_shared_drive_id')
         RUN_ARTIFACTS_URL = credentials('perfci_run_artifacts_url')
         REDIS = credentials('perfci_redis')
         WORKER_DISK_IDS = credentials('perfci_worker_disk_ids')
@@ -38,7 +42,7 @@ pipeline {
         CONTAINER_KUBECONFIG_PATH = '/home/jenkins/.kube/config'
         WORKER_DISK_PREFIX = 'wwn-0x'
         SAVE_ARTIFACTS_LOCAL = 'False'
-        ENABLE_PROMETHEUS_SNAPSHOT = 'True'
+        ENABLE_PROMETHEUS_SNAPSHOT = 'False'
         DELETE_ALL = 'False' // Not delete the running Windows11 VMs
         VERIFICATION_ONLY = 'True'
         RUN_TYPE = 'test_ci'
@@ -167,6 +171,10 @@ END
                                         -e IBM_SECRET_ACCESS_KEY='${IBM_SECRET_ACCESS_KEY}' \
                                         -e IBM_BUCKET='${IBM_BUCKET}' \
                                         -e IBM_KEY='${IBM_KEY}' \
+                                        -e GOOGLE_DRIVE_PATH='${GOOGLE_DRIVE_PATH}' \
+                                        -e GOOGLE_DRIVE_CREDENTIALS='${GOOGLE_DRIVE_CREDENTIALS}' \
+                                        -e GOOGLE_DRIVE_TOKEN='${GOOGLE_DRIVE_TOKEN}' \
+                                        -e GOOGLE_DRIVE_SHARED_DRIVE_ID='${GOOGLE_DRIVE_SHARED_DRIVE_ID}' \
                                         -e RUN_ARTIFACTS_URL='${RUN_ARTIFACTS_URL}' \
                                         -e BUILD_VERSION='${build_version}' \
                                         -e RUN_TYPE='${RUN_TYPE}' \