Test new appraoch

.github/workflows/analysis_workflow.yml

@@ -31,15 +31,9 @@ jobs:
     outputs:
       matrix: ${{ steps.get_tags.outputs.commits }}
 
-  cibw_docker_image:
-    uses: ./.github/workflows/cibw_docker_image.yml
-    permissions: {packages: write}
-    with:
-        cibuildwheel_ver: "2.12.1"
-        force_update: false
 
   benchmark_commits:
-    needs: [get_commits_to_benchmark, cibw_docker_image]  
+    needs: [get_commits_to_benchmark]  
     strategy:
       fail-fast: false
       matrix: 
@@ -49,7 +43,6 @@ jobs:
     secrets: inherit
     with:
       commit: ${{ matrix.commits }}
-      cibw_image_tag: ${{ needs.cibw_docker_image.outputs.tag }}
       run_all_benchmarks: ${{ inputs.run_all_benchmarks || false }}
       run_on_pr_head: ${{ github.event_name == 'pull_request_target' }}
 
@@ -110,7 +103,7 @@ jobs:
     needs: [cibw_docker_image]  
     runs-on: "ubuntu-22.04"
     container:
-        image: quay.io/pypa/manylinux_2_28_x86_64
+        image: quay.io/pypa/manylinux_2_28_x86_64:latest
     services:
       mongodb:
         image: mongo:4.4
@@ -136,7 +129,7 @@ jobs:
       - name: Install deps
         run: |
           yum update -y
-          yum install -y zip flex bison krb5-devel cyrus-sasl-devel openssl-devel \
+          yum install -y zip flex bison gcc-toolset-11-gdb gcc-toolset-10-libatomic-devel krb5-devel cyrus-sasl-devel openssl-devel \
           unzip tar epel-release jq wget libcurl-devel python3 \
           python3-devel python3-pip perl-IPC-Cmd
 

.github/workflows/benchmark_commits.yml

@@ -4,7 +4,6 @@ on:
     inputs:
       run_all_benchmarks: {required: true, type: boolean, description: Run all benchmarks or just the one for the given commit}
       commit:             {required: true, type: string, description: commit hash that will be benchmarked}
-      cibw_image_tag:     {required: true, type: string, description: Linux only. As built by cibw_docker_image.yml workflow}
       run_on_pr_head:     {required: false, default: false, type: boolean, description: Specifies if the benchmark should run on PR head branch}
 jobs:
   start_ec2_runner:
@@ -20,7 +19,7 @@ jobs:
       always() &&
       !cancelled()
     runs-on: ${{ needs.start_ec2_runner.outputs.label }}
-    container: ${{ inputs.cibw_image_tag}}
+    container: quay.io/pypa/manylinux_2_28_x86_64:latest
     env:
       # this is potentially overflowing the cache, so should be looked into after we address issue #1057
       SCCACHE_GHA_VERSION: ${{vars.SCCACHE_GHA_VERSION || 1}} # Setting this env var enables the caching

.github/workflows/build_steps.yml

@@ -92,7 +92,7 @@ jobs:
         if: matrix.os == 'linux' && inputs.job_type != 'build-python-wheels'
         run: |
           yum update -y
-          yum install -y zip flex bison devtoolset-11-gdb devtoolset-10-libatomic-devel krb5-devel cyrus-sasl-devel openssl-devel \
+          yum install -y zip flex bison gcc-toolset-11-gdb gcc-toolset-10-libatomic-devel krb5-devel cyrus-sasl-devel openssl-devel \
           unzip tar epel-release jq wget libcurl-devel python3 \
           python3-devel python3-pip perl-IPC-Cmd