From 6ae8361d8f398562dcb190cee4a785c4521c52f4 Mon Sep 17 00:00:00 2001
From: "Karl W. Schulz" <karl.schulz@amd.com>
Date: Mon, 7 Nov 2022 14:25:57 -0600
Subject: [PATCH] update analyze-commands and analyze-workloads tests to start
 from public ROCm container instead of re-installing rocm each time from
 scratch

Signed-off-by: Karl W. Schulz <karl.schulz@amd.com>
---
 .github/workflows/analyze-commands.yml  | 34 ++++++++++++-------------
 .github/workflows/analyze-workloads.yml | 32 ++++++++++-------------
 2 files changed, 29 insertions(+), 37 deletions(-)

diff --git a/.github/workflows/analyze-commands.yml b/.github/workflows/analyze-commands.yml
index e6ddea1120..31d27c2b17 100644
--- a/.github/workflows/analyze-commands.yml
+++ b/.github/workflows/analyze-commands.yml
@@ -5,7 +5,7 @@ name: analyze-commands
 # Controls when the workflow will run
 on:
   push:
-    branches: [ main, dev, ci ]
+    branches: [ main, dev ]
   pull_request:
     branches: [ main, dev ]
 
@@ -17,29 +17,27 @@ jobs:
   build:
     # The type of runner that the job will run on
     runs-on: ubuntu-latest
-
+    container:
+       image: rocm/dev-ubuntu-22.04:5.3
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
-      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v3
-        with:
-          submodules: recursive
-          token: ${{ secrets.GH_PAT }}
       # Cancel any previous runs
       - name: Cancel Previous Runs
         uses: styfle/cancel-workflow-action@0.11.0
-
-      - name: Install Python
-        uses: actions/setup-python@v2
-        with:
-          python-version: '3.8'
-      - name: Install Rocm
+      - name: Install baseline OS dependencies
         run: |
-          sudo ./cmake/rocm_install.sh
           sudo apt-get update
-          sudo apt-get dist-upgrade -y
-          sudo apt-get autoclean
-      - name: Install python prereqs
+          sudo apt-get install -y git
+          sudo apt-get install -y python3-pip
+          sudo apt-get install -y cmake
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          submodules: recursive
+          token: ${{ secrets.GH_PAT }}
+      - name: List ROCm
+        run: ls /opt/rocm
+      - name: Install Python prereqs
         run: |
           python3 -m pip install -r requirements.txt
           python3 -m pip install pyinstaller pytest pytest-cov mock
@@ -49,7 +47,7 @@ jobs:
           cd build
           cmake -DCMAKE_INSTALL_PREFIX=/opt/omniperf ..
           make install
-      - name: run ctest
+      - name: Run ctest
         run: |
           cd build
           ctest --verbose -R test_analyze_commands
diff --git a/.github/workflows/analyze-workloads.yml b/.github/workflows/analyze-workloads.yml
index a141b24b74..ef38abfdde 100644
--- a/.github/workflows/analyze-workloads.yml
+++ b/.github/workflows/analyze-workloads.yml
@@ -6,7 +6,7 @@ name: analyze-workloads
 # Controls when the workflow will run
 on:
   push:
-    branches: [ main, dev, ci ]
+    branches: [ main, dev ]
   pull_request:
     branches: [ main, dev ]
 
@@ -18,34 +18,28 @@ jobs:
   build:
     # The type of runner that the job will run on
     runs-on: ubuntu-latest
-
+    container:
+       image: rocm/dev-ubuntu-22.04:5.3
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
-      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v3
-        with:
-          submodules: recursive
-          token: ${{ secrets.GH_PAT }}
       # Cancel any previous runs
       - name: Cancel Previous Runs
         uses: styfle/cancel-workflow-action@0.11.0
-
-
-      - name: Install Python
-        uses: actions/setup-python@v2
-        with:
-          python-version: '3.8'
-      - name: Install Rocm
+      - name: Install baseline OS dependencies
         run: |
-          sudo ./cmake/rocm_install.sh
           sudo apt-get update
-          sudo apt-get dist-upgrade -y
-          sudo apt-get autoclean
-      - name: Install python prereqs
+          sudo apt-get install -y git
+          sudo apt-get install -y python3-pip
+          sudo apt-get install -y cmake
+      - name: Checkout	  
+        uses: actions/checkout@v3
+        with:
+          submodules: recursive
+          token: ${{ secrets.GH_PAT }}
+      - name: Install Python prereqs
         run: |
           python3 -m pip install -r requirements.txt
           python3 -m pip install pyinstaller pytest pytest-cov
-          
       - name: Configure and install 
         run: |
           mkdir build