Merge branch 'main' into add_bootstorm_windows11

redhat-performance · Nov 2, 2023 · 2511f4a · 2511f4a
2 parents dfb8cab + 461e445
commit 2511f4a
Show file tree

Hide file tree

Showing 13 changed files with 82 additions and 61 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,7 +1,7 @@
 [bumpversion]
 commit = False
 tag = True
-current_version = 1.0.537
+current_version = 1.0.538
 tag_name = v{current_version}
 message = GitHub Actions Build {current_version}
 

diff --git a/.github/workflows/Perf_Env_Build_Test_CI.yml b/.github/workflows/Perf_Env_Build_Test_CI.yml
@@ -67,13 +67,13 @@ jobs:
           IBM_BUCKET: ${{ secrets.IBM_BUCKET }}
           IBM_KEY: ${{ secrets.IBM_KEY }}
           RUN_ARTIFACTS_URL: ${{ secrets.PERF_RUN_ARTIFACTS_URL }}
-          OC_CLIENT_VERSION: ${{ secrets.PERF_OC_CLIENT_VERSION }}
+          OCP_CLIENT_VERSION: ${{ secrets.PERF_OCP_CLIENT_VERSION }}
         run: |
           # Install Dockerfile content for pytest
           # install oc/kubectl
-          curl -L "https://mirror.openshift.com/pub/openshift-v4/clients/ocp/${OC_CLIENT_VERSION}/openshift-client-linux-${OC_CLIENT_VERSION}.tar.gz" -o "$RUNNER_PATH/openshift-client-linux-${OC_CLIENT_VERSION}.tar.gz"
-          tar -xzvf $RUNNER_PATH/openshift-client-linux-${OC_CLIENT_VERSION}.tar.gz -C $RUNNER_PATH/
-          rm $RUNNER_PATH/openshift-client-linux-${OC_CLIENT_VERSION}.tar.gz
+          curl -L "https://mirror.openshift.com/pub/openshift-v4/clients/ocp/${OCP_CLIENT_VERSION}/openshift-client-linux-${OCP_CLIENT_VERSION}.tar.gz" -o "$RUNNER_PATH/openshift-client-linux-${OCP_CLIENT_VERSION}.tar.gz"
+          tar -xzvf $RUNNER_PATH/openshift-client-linux-${OCP_CLIENT_VERSION}.tar.gz -C $RUNNER_PATH/
+          rm $RUNNER_PATH/openshift-client-linux-${OCP_CLIENT_VERSION}.tar.gz
           cp $RUNNER_PATH/kubectl /usr/local/bin/kubectl
           cp $RUNNER_PATH/oc /usr/local/bin/oc
           
@@ -138,13 +138,13 @@ jobs:
         GRAFANA_URL: ${{ secrets.PERF_GRAFANA_URL }}
         GRAFANA_API_KEY: ${{ secrets.PERF_GRAFANA_API_KEY }}
         GRAFANA_JSON: ${{ secrets.PERF_GRAFANA_JSON }}
-        OC_CLIENT_VERSION: ${{ secrets.PERF_OC_CLIENT_VERSION }}
+        OCP_CLIENT_VERSION: ${{ secrets.PERF_OCP_CLIENT_VERSION }}
       run: |
         # Install Dockerfile content for pytest
         # install oc/kubectl
-        curl -L "https://mirror.openshift.com/pub/openshift-v4/clients/ocp/${OC_CLIENT_VERSION}/openshift-client-linux-${OC_CLIENT_VERSION}.tar.gz" -o "$RUNNER_PATH/openshift-client-linux-${OC_CLIENT_VERSION}.tar.gz"
-        tar -xzvf $RUNNER_PATH/openshift-client-linux-${OC_CLIENT_VERSION}.tar.gz -C $RUNNER_PATH/
-        rm $RUNNER_PATH/openshift-client-linux-${OC_CLIENT_VERSION}.tar.gz
+        curl -L "https://mirror.openshift.com/pub/openshift-v4/clients/ocp/${OCP_CLIENT_VERSION}/openshift-client-linux-${OCP_CLIENT_VERSION}.tar.gz" -o "$RUNNER_PATH/openshift-client-linux-${OCP_CLIENT_VERSION}.tar.gz"
+        tar -xzvf $RUNNER_PATH/openshift-client-linux-${OCP_CLIENT_VERSION}.tar.gz -C $RUNNER_PATH/
+        rm $RUNNER_PATH/openshift-client-linux-${OCP_CLIENT_VERSION}.tar.gz
         cp $RUNNER_PATH/kubectl /usr/local/bin/kubectl
         cp $RUNNER_PATH/oc /usr/local/bin/oc
         rm -rf $RUNNER_PATH/kubectl

diff --git a/.github/workflows/Perf_Env_PR_Test_CI.yml b/.github/workflows/Perf_Env_PR_Test_CI.yml
@@ -78,13 +78,13 @@ jobs:
           IBM_BUCKET: ${{ secrets.IBM_BUCKET }}
           IBM_KEY: ${{ secrets.IBM_KEY }}
           RUN_ARTIFACTS_URL: ${{ secrets.PERF_RUN_ARTIFACTS_URL }}
-          OC_CLIENT_VERSION: ${{ secrets.PERF_OC_CLIENT_VERSION }}
+          OCP_CLIENT_VERSION: ${{ secrets.PERF_OCP_CLIENT_VERSION }}
         run: |
           # Install Dockerfile content for pytest
           # install oc/kubectl
-          curl -L "https://mirror.openshift.com/pub/openshift-v4/clients/ocp/${OC_CLIENT_VERSION}/openshift-client-linux-${OC_CLIENT_VERSION}.tar.gz" -o "$RUNNER_PATH/openshift-client-linux-${OC_CLIENT_VERSION}.tar.gz"
-          tar -xzvf $RUNNER_PATH/openshift-client-linux-${OC_CLIENT_VERSION}.tar.gz -C $RUNNER_PATH/
-          rm $RUNNER_PATH/openshift-client-linux-${OC_CLIENT_VERSION}.tar.gz
+          curl -L "https://mirror.openshift.com/pub/openshift-v4/clients/ocp/${OCP_CLIENT_VERSION}/openshift-client-linux-${OCP_CLIENT_VERSION}.tar.gz" -o "$RUNNER_PATH/openshift-client-linux-${OCP_CLIENT_VERSION}.tar.gz"
+          tar -xzvf $RUNNER_PATH/openshift-client-linux-${OCP_CLIENT_VERSION}.tar.gz -C $RUNNER_PATH/
+          rm $RUNNER_PATH/openshift-client-linux-${OCP_CLIENT_VERSION}.tar.gz
           cp $RUNNER_PATH/kubectl /usr/local/bin/kubectl
           cp $RUNNER_PATH/oc /usr/local/bin/oc
           
@@ -151,13 +151,13 @@ jobs:
         GRAFANA_URL: ${{ secrets.PERF_GRAFANA_URL }}
         GRAFANA_API_KEY: ${{ secrets.PERF_GRAFANA_API_KEY }}
         GRAFANA_JSON_PATH: ${{ secrets.PERF_GRAFANA_JSON_PATH }}
-        OC_CLIENT_VERSION: ${{ secrets.PERF_OC_CLIENT_VERSION }}
+        OCP_CLIENT_VERSION: ${{ secrets.PERF_OCP_CLIENT_VERSION }}
       run: |
         # Install Dockerfile content for pytest
         # install oc/kubectl
-        curl -L "https://mirror.openshift.com/pub/openshift-v4/clients/ocp/${OC_CLIENT_VERSION}/openshift-client-linux-${OC_CLIENT_VERSION}.tar.gz" -o "$RUNNER_PATH/openshift-client-linux-${OC_CLIENT_VERSION}.tar.gz"
-        tar -xzvf $RUNNER_PATH/openshift-client-linux-${OC_CLIENT_VERSION}.tar.gz -C $RUNNER_PATH/
-        rm $RUNNER_PATH/openshift-client-linux-${OC_CLIENT_VERSION}.tar.gz
+        curl -L "https://mirror.openshift.com/pub/openshift-v4/clients/ocp/${OCP_CLIENT_VERSION}/openshift-client-linux-${OCP_CLIENT_VERSION}.tar.gz" -o "$RUNNER_PATH/openshift-client-linux-${OCP_CLIENT_VERSION}.tar.gz"
+        tar -xzvf $RUNNER_PATH/openshift-client-linux-${OCP_CLIENT_VERSION}.tar.gz -C $RUNNER_PATH/
+        rm $RUNNER_PATH/openshift-client-linux-${OCP_CLIENT_VERSION}.tar.gz
         cp $RUNNER_PATH/kubectl /usr/local/bin/kubectl
         cp $RUNNER_PATH/oc /usr/local/bin/oc
         
@@ -217,13 +217,13 @@ jobs:
        ELASTICSEARCH_PORT: ${{ secrets.PERF_ELASTICSEARCH_PORT }}
        ELASTICSEARCH_USER: ${{ secrets.PERF_ELASTICSEARCH_USER }}
        ELASTICSEARCH_PASSWORD: ${{ secrets.PERF_ELASTICSEARCH_PASSWORD }}
-       OC_CLIENT_VERSION: ${{ secrets.PERF_OC_CLIENT_VERSION }}
+       OCP_CLIENT_VERSION: ${{ secrets.PERF_OCP_CLIENT_VERSION }}
      run: |
        # Install Dockerfile content for pytest
        # install oc/kubectl
-       curl -L "https://mirror.openshift.com/pub/openshift-v4/clients/ocp/${OC_CLIENT_VERSION}/openshift-client-linux-${OC_CLIENT_VERSION}.tar.gz" -o "$RUNNER_PATH/openshift-client-linux-${OC_CLIENT_VERSION}.tar.gz"
-       tar -xzvf $RUNNER_PATH/openshift-client-linux-${OC_CLIENT_VERSION}.tar.gz -C $RUNNER_PATH/
-       rm $RUNNER_PATH/openshift-client-linux-${OC_CLIENT_VERSION}.tar.gz
+       curl -L "https://mirror.openshift.com/pub/openshift-v4/clients/ocp/${OCP_CLIENT_VERSION}/openshift-client-linux-${OCP_CLIENT_VERSION}.tar.gz" -o "$RUNNER_PATH/openshift-client-linux-${OCP_CLIENT_VERSION}.tar.gz"
+       tar -xzvf $RUNNER_PATH/openshift-client-linux-${OCP_CLIENT_VERSION}.tar.gz -C $RUNNER_PATH/
+       rm $RUNNER_PATH/openshift-client-linux-${OCP_CLIENT_VERSION}.tar.gz
        cp $RUNNER_PATH/kubectl /usr/local/bin/kubectl
        cp $RUNNER_PATH/oc /usr/local/bin/oc
 

diff --git a/.github/workflows/Weekly_Func_Env_Installer_CI.yml b/.github/workflows/Weekly_Func_Env_Installer_CI.yml
@@ -64,8 +64,8 @@ jobs:
           END
       - name: ▶ OCP assisted installer
         env:
-          INSTALL_OCP_VERSION: "latest-4.14.0-rc"
-          OC_CLIENT_VERSION: "4.14.0-rc.0"
+          INSTALL_OCP_VERSION: "latest-4.14"
+          OCP_CLIENT_VERSION: "4.14.1"
           IBM_API_KEY: ${{ secrets.IBM_API_KEY }}
           GITHUB_TOKEN: ${{ secrets.GIT_TOKEN }}
           WORKER_IDS: ${{ secrets.PERF_WORKER_IDS }}
@@ -88,8 +88,8 @@ jobs:
           echo '>>>>>>>>>>>>>>>>>>>>>>>>>> OCP end step: ${{ matrix.step }}   >>>>>>>>>>>>>>>>>>>>>>>>>>>>'
       - name: ▶ Rerun OCP assisted install after failure
         env:
-          INSTALL_OCP_VERSION: "latest-4.14.0-rc"
-          OC_CLIENT_VERSION: "4.14.0-rc.0"
+          INSTALL_OCP_VERSION: "latest-4.14"
+          OCP_CLIENT_VERSION: "4.14.1"
           IBM_API_KEY: ${{ secrets.IBM_API_KEY }}
           GITHUB_TOKEN: ${{ secrets.GIT_TOKEN }}
           WORKER_IDS: ${{ secrets.PERF_WORKER_IDS }}

diff --git a/.github/workflows/Weekly_Perf_Env_Installer_CI.yml b/.github/workflows/Weekly_Perf_Env_Installer_CI.yml
@@ -64,8 +64,8 @@ jobs:
           END
       - name: ▶ OCP assisted installer
         env:
-          INSTALL_OCP_VERSION: "latest-4.14.0-rc"
-          OC_CLIENT_VERSION: "4.14.0-rc.0"
+          INSTALL_OCP_VERSION: "latest-4.14"
+          OCP_CLIENT_VERSION: "4.14.1"
           IBM_API_KEY: ${{ secrets.IBM_API_KEY }}
           GITHUB_TOKEN: ${{ secrets.GIT_TOKEN }}
           WORKER_IDS: ${{ secrets.PERF_WORKER_IDS }}
@@ -88,8 +88,8 @@ jobs:
           echo '>>>>>>>>>>>>>>>>>>>>>>>>>> OCP end step: ${{ matrix.step }}   >>>>>>>>>>>>>>>>>>>>>>>>>>>>'
       - name: ▶ Rerun OCP assisted install after failure
         env:
-          INSTALL_OCP_VERSION: "latest-4.14.0-rc"
-          OC_CLIENT_VERSION: "4.14.0-rc.0"
+          INSTALL_OCP_VERSION: "latest-4.14"
+          OCP_CLIENT_VERSION: "4.14.1"
           IBM_API_KEY: ${{ secrets.IBM_API_KEY }}
           GITHUB_TOKEN: ${{ secrets.GIT_TOKEN }}
           WORKER_IDS: ${{ secrets.PERF_WORKER_IDS }}

diff --git a/Dockerfile b/Dockerfile
@@ -31,12 +31,12 @@ RUN wget https://www.python.org/ftp/python/${python_full_version}/Python-${pytho
 RUN python3.10 -m pip --no-cache-dir install --upgrade pip && pip --no-cache-dir install benchmark-runner --upgrade
 
 # install oc/kubectl client tools for OpenShift/Kubernetes
-ARG oc_client_version="4.14.0-rc.0"
-RUN  curl -L "https://mirror.openshift.com/pub/openshift-v4/clients/ocp/${oc_client_version}/openshift-client-linux-${oc_client_version}.tar.gz" -o "/tmp/openshift-client-linux-${oc_client_version}.tar.gz" \
-     && tar -xzvf /tmp/openshift-client-linux-${oc_client_version}.tar.gz -C /tmp/ \
+ARG OCP_CLIENT_VERSION="4.14.1"
+RUN  curl -L "https://mirror.openshift.com/pub/openshift-v4/clients/ocp/${OCP_CLIENT_VERSION}/openshift-client-linux-${OCP_CLIENT_VERSION}.tar.gz" -o "/tmp/openshift-client-linux-${OCP_CLIENT_VERSION}.tar.gz" \
+     && tar -xzvf /tmp/openshift-client-linux-${OCP_CLIENT_VERSION}.tar.gz -C /tmp/ \
      && mv /tmp/kubectl /usr/local/bin/kubectl \
      && mv /tmp/oc /usr/local/bin/oc \
-     && rm -rf /tmp/openshift-client-linux-${oc_client_version}.tar.gz /tmp/kubectl /tmp/oc
+     && rm -rf /tmp/openshift-client-linux-${OCP_CLIENT_VERSION}.tar.gz /tmp/kubectl /tmp/oc
 
 # Install virtctl for VNC
 ARG virtctl_version="1.0.0"

diff --git a/benchmark_runner/common/ocp_resources/create_ocp_resource.py b/benchmark_runner/common/ocp_resources/create_ocp_resource.py
@@ -77,23 +77,23 @@ def create_resource(self, resource: str):
         self.remove_resource_files(path=os.path.join(self.__dir_path, resource))
         resource_files = self.get_sorted_resources(resource=resource)
         if 'lso' == resource:
-            self.__create_lso = CreateLSO(self.__oc, path=os.path.join(self.__dir_path, resource), resource_list=resource_files)
-            self.__create_lso.create_lso()
+            create_lso = CreateLSO(self.__oc, path=os.path.join(self.__dir_path, resource), resource_list=resource_files)
+            create_lso.create_lso()
         elif 'odf' == resource:
-            self.__create_odf = CreateODF(self.__oc, path=os.path.join(self.__dir_path, resource), resource_list=resource_files, worker_disk_ids=self.__worker_disk_ids, worker_disk_prefix=self.__worker_disk_prefix)
-            self.__create_odf.create_odf()
+            create_odf = CreateODF(self.__oc, path=os.path.join(self.__dir_path, resource), resource_list=resource_files, worker_disk_ids=self.__worker_disk_ids, worker_disk_prefix=self.__worker_disk_prefix)
+            create_odf.create_odf()
         elif 'kata' == resource:
-            self.__create_kata = CreateKata(self.__oc, path=os.path.join(self.__dir_path, resource), resource_list=resource_files)
-            self.__create_kata.create_kata()
+            create_kata = CreateKata(self.__oc, path=os.path.join(self.__dir_path, resource), resource_list=resource_files)
+            create_kata.create_kata()
         elif 'cnv' == resource:
-            self.__create_cnv = CreateCNV(self.__oc, path=os.path.join(self.__dir_path, resource), resource_list=resource_files)
-            self.__create_cnv.create_cnv()
+            create_cnv = CreateCNV(self.__oc, path=os.path.join(self.__dir_path, resource), resource_list=resource_files)
+            create_cnv.create_cnv()
         elif 'infra' == resource:
-            self.__create_infra = MigrateInfra(self.__oc, path=os.path.join(self.__dir_path, resource), resource_list=resource_files)
-            self.__create_infra.migrate_infra()
+            create_infra = MigrateInfra(self.__oc, path=os.path.join(self.__dir_path, resource), resource_list=resource_files)
+            create_infra.migrate_infra()
         elif 'custom' == resource:
-            self.__create_custom = CreateCustom(self.__oc, path=os.path.join(self.__dir_path, resource), resource_list=resource_files)
-            self.__create_custom.create_custom()
+            create_custom = CreateCustom(self.__oc, path=os.path.join(self.__dir_path, resource), resource_list=resource_files)
+            create_custom.create_custom()
             # remove resource files
         self.remove_resource_files(path=os.path.join(self.__dir_path, resource))
 
diff --git a/benchmark_runner/common/ocp_resources/create_odf.py b/benchmark_runner/common/ocp_resources/create_odf.py
@@ -27,15 +27,16 @@ def create_odf(self):
         for resource in self.__resource_list:
             logger.info(f'run {resource}')
             if resource.endswith('.sh'):
-                # build sgdisks path dynamically
-                if '01_sgdisks.sh' == resource:
-                    node_sgdisk = ''
+                # disk cleanup - reference: https://rook.io/docs/rook/v1.12/Getting-Started/ceph-teardown/#delete-the-data-on-hosts
+                if '01_delete_disks.sh' == resource:
+                    delete_node_disk = ''
                     result_dict = {}
                     for node, disk_ids in self.__worker_disk_ids.items():
                         for disk_id in disk_ids:
-                            node_sgdisk += f'sgdisk --zap-all /dev/disk/by-id/{self.__worker_disk_prefix}{disk_id}; wipefs -a /dev/disk/by-id/{self.__worker_disk_prefix}{disk_id};'
-                        result_dict[node] = node_sgdisk
-                        node_sgdisk = ''
+                            disk = f'/dev/disk/by-id/{self.__worker_disk_prefix}{disk_id}'
+                            delete_node_disk += f"sgdisk --zap-all {disk}; wipefs -a {disk}; dd if=/dev/zero of='{disk}' bs=1M count=100 oflag=direct,dsync; blkdiscard {disk}; partprobe {disk}"
+                        result_dict[node] = delete_node_disk
+                        delete_node_disk = ''
                     self.__oc.run(cmd=f'chmod +x {os.path.join(self.__path, resource)}; {self.__path}/./{resource} "{list(result_dict.keys())[0]}" "{list(result_dict.values())[0]}" "{list(result_dict.keys())[1]}" "{list(result_dict.values())[1]}" "{list(result_dict.keys())[2]}" "{list(result_dict.values())[2]}"')
                 else:
                     self.__oc.run(cmd=f'chmod +x {os.path.join(self.__path, resource)}; {self.__path}/./{resource}')

diff --git a/benchmark_runner/common/ocp_resources/odf/template/01_delete_disks_template.sh b/benchmark_runner/common/ocp_resources/odf/template/01_delete_disks_template.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env sh
+
+while (($# >= 2)) ; do
+    node="$1"
+    delete_disk_command="$2"
+    oc debug "node/$node"  -- chroot /host sh -c "$delete_disk_command"
+    shift 2
+done
diff --git a/benchmark_runner/common/ocp_resources/odf/template/01_sgdisks_template.sh b/benchmark_runner/common/ocp_resources/odf/template/01_sgdisks_template.sh
diff --git a/benchmark_runner/grafana/perf/dashboard.json b/benchmark_runner/grafana/perf/dashboard.json
@@ -668,6 +668,10 @@
                            "index": 145,
                            "text": "4.13.4-26"
                         },
+                        "41348": {
+                           "index": 176,
+                           "text": "4.13.4-8"
+                        },
                         "413482": {
                            "index": 148,
                            "text": "4.13.4-82"
@@ -736,6 +740,14 @@
                            "index": 173,
                            "text": "4.14.0-2258"
                         },
+                        "41402337": {
+                           "index": 175,
+                           "text": "4.14.0-2337"
+                        },
+                        "41402356": {
+                           "index": 178,
+                           "text": "4.14.0-2356"
+                        },
                         "41404": {
                            "index": 165,
                            "text": "4.14.0-rc.4"
@@ -744,6 +756,14 @@
                            "index": 168,
                            "text": "4.14.0-rc.6"
                         },
+                        "41407": {
+                           "index": 174,
+                           "text": "4.14.0-rc.7"
+                        },
+                        "4141": {
+                           "index": 177,
+                           "text": "4.14.1"
+                        },
                         "4814": {
                            "index": 6,
                            "text": "4.8.14"