Remove references to the snappy_creds secret (#357)

* Remove references to the snappy_creds secret Signed-off-by: Raul Sevilla <[email protected]> * Remove remaining snappy references Signed-off-by: Raul Sevilla <[email protected]> --------- Signed-off-by: Raul Sevilla <[email protected]>
cloud-bulldozer · Feb 14, 2024 · 9ed28ca · 9ed28ca
1 parent 20703db
commit 9ed28ca
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 21 deletions.
diff --git a/dags/nocp/README.md b/dags/nocp/README.md
@@ -47,7 +47,6 @@ This DAG is used for OCM testing. Modules in this DAG -
 * Each test is called with a timeout.
   ```Timeout = test duration + 10 minutes```
   This extra 10 minutes help test to create necessary result files after running the test for given duration
-* ```Automation.py``` uploads all result files to snappy server
 * Kube burner is used to pull metrics from clusters and account manager services and push to observability ES.
 * Finally it displays dashboard URLs for these metrics
 * At the end, this script returns UUID and test result to airflow. UUID is used in the next task (i.e cleanup task)

diff --git a/dags/nocp/docs/nocp_benchmarks.md b/dags/nocp/docs/nocp_benchmarks.md
@@ -7,7 +7,7 @@ Some workloads doesn't need OCP environemnt. For example, ocm-api-load which tes
 * tool is run from the jump host
 * user has to manually setup needed packages in the jump host
 * airflow will run only one task i.e benchmark task
-* user provided script for benchmark task should handle everything like triggering the tool on jump host, scrapping metrics, pushing data to snappy and cleanup.
+* user provided script for benchmark task should handle everything like triggering the tool on jump host or scrapping metrics
 
 
 ## Adding the new workload

diff --git a/dags/nocp/tasks/benchmarks/nocp.py b/dags/nocp/tasks/benchmarks/nocp.py
@@ -23,18 +23,13 @@ def __init__(self, app, dag, config: DagConfig, task_group="benchmarks"):
         self.dag = dag
         self.task_group = task_group
         self.dag_config = config
-        self.snappy_creds = var_loader.get_secret("snappy_creds", deserialize_json=True)
         self.es_server_baseline = var_loader.get_secret("es_server_baseline")
 
         # Specific Task Configuration
         self.vars = nocp_var_loader.build_nocp_task_vars(
             app, task=self.task_group)
         self.git_name=self._git_name()
         self.env = {
-            "SNAPPY_DATA_SERVER_URL": self.snappy_creds['server'],
-            "SNAPPY_DATA_SERVER_USERNAME": self.snappy_creds['username'],
-            "SNAPPY_DATA_SERVER_PASSWORD": self.snappy_creds['password'],
-            "SNAPPY_USER_FOLDER": self.git_name,
             "GIT_USER": self.git_name,
             "TASK_GROUP": self.task_group,
             "ES_SERVER_BASELINE": self.es_server_baseline,

diff --git a/dags/openshift_nightlies/config/baremetal-benchmarks/webfuse-bench.json b/dags/openshift_nightlies/config/baremetal-benchmarks/webfuse-bench.json
@@ -8,7 +8,6 @@
             "env": {
                 "WORKLOAD": "pod2svc",
                 "COMPARE": "false",
-                "ENABLE_SNAPPY_BACKUP": "false",
                 "MULTI_AZ": "false"
             }
         },

diff --git a/dags/openshift_nightlies/scripts/run_benchmark.sh b/dags/openshift_nightlies/scripts/run_benchmark.sh
@@ -21,7 +21,6 @@ setup(){
     export KUBECONFIG=/home/airflow/workspace/config
     export GSHEET_KEY_LOCATION=/tmp/key.json
     export RUN_ID=${AIRFLOW_CTX_DAG_ID}/${AIRFLOW_CTX_DAG_RUN_ID}/$AIRFLOW_CTX_TASK_ID
-    export SNAPPY_RUN_ID=${AIRFLOW_CTX_DAG_ID}/${AIRFLOW_CTX_DAG_RUN_ID}
     echo "cpt: true" > metadata.yml
 
     curl -sS https://mirror.openshift.com/pub/openshift-v4/clients/ocp/latest/openshift-client-linux.tar.gz | tar xz oc

diff --git a/dags/openshift_nightlies/scripts/utils/run_scale_ci_diagnosis.sh b/dags/openshift_nightlies/scripts/utils/run_scale_ci_diagnosis.sh
@@ -21,7 +21,6 @@ setup(){
     export KUBECONFIG=/home/airflow/workspace/config
     export BUILD_NUMBER=test
     export RUN_ID=${AIRFLOW_CTX_DAG_ID}/${AIRFLOW_CTX_DAG_RUN_ID}/$AIRFLOW_CTX_TASK_ID
-    export SNAPPY_RUN_ID=${AIRFLOW_CTX_DAG_ID}/${AIRFLOW_CTX_DAG_RUN_ID}
 
 
     curl -sS https://mirror.openshift.com/pub/openshift-v4/clients/ocp/latest/openshift-client-linux.tar.gz | tar xz oc

diff --git a/dags/openshift_nightlies/tasks/benchmarks/defaults.json b/dags/openshift_nightlies/tasks/benchmarks/defaults.json
@@ -83,8 +83,7 @@
                 "GOLD_SDN": "openshiftsdn",
                 "COMPARE_WITH_GOLD": "true",
                 "EMAIL_ID_FOR_RESULTS_SHEET": "[email protected]",
-                "GSHEET_KEY_LOCATION": "/tmp/key.json",
-                "ENABLE_SNAPPY_BACKUP": "true"
+                "GSHEET_KEY_LOCATION": "/tmp/key.json"
             }
         },
         {
@@ -96,8 +95,7 @@
                 "GOLD_SDN": "openshiftsdn",
                 "COMPARE_WITH_GOLD": "true",
                 "EMAIL_ID_FOR_RESULTS_SHEET": "[email protected]",
-                "GSHEET_KEY_LOCATION": "/tmp/key.json",
-                "ENABLE_SNAPPY_BACKUP": "true"
+                "GSHEET_KEY_LOCATION": "/tmp/key.json"
             }
         },
         {
@@ -109,8 +107,7 @@
                 "GOLD_SDN": "openshiftsdn",
                 "COMPARE_WITH_GOLD": "true",
                 "EMAIL_ID_FOR_RESULTS_SHEET": "[email protected]",
-                "GSHEET_KEY_LOCATION": "/tmp/key.json",
-                "ENABLE_SNAPPY_BACKUP": "true"
+                "GSHEET_KEY_LOCATION": "/tmp/key.json"
             }
         },
         {

diff --git a/dags/openshift_nightlies/tasks/benchmarks/e2e.py b/dags/openshift_nightlies/tasks/benchmarks/e2e.py
@@ -23,7 +23,6 @@ def __init__(self, dag, config: DagConfig, release: OpenshiftRelease, task_group
         self.release = release
         self.task_group = task_group
         self.dag_config = config
-        self.snappy_creds = var_loader.get_secret("snappy_creds", deserialize_json=True)
         self.es_server_baseline = var_loader.get_secret("es_server_baseline")
         self.gsheet = var_loader.get_secret("gsheet_key")
 
@@ -38,10 +37,6 @@ def __init__(self, dag, config: DagConfig, release: OpenshiftRelease, task_group
             release=self.release, task=self.task_group)
         self.git_name=self._git_name()
         self.env = {
-            "SNAPPY_DATA_SERVER_URL": self.snappy_creds['server'],
-            "SNAPPY_DATA_SERVER_USERNAME": self.snappy_creds['username'],
-            "SNAPPY_DATA_SERVER_PASSWORD": self.snappy_creds['password'],
-            "SNAPPY_USER_FOLDER": self.git_name,
             "PLATFORM": self.release.platform,
             "TASK_GROUP": self.task_group,
             "ES_SERVER_BASELINE": self.es_server_baseline