From 186941c45402488870a5862ea0924932470a12de Mon Sep 17 00:00:00 2001
From: Stephanie Brink <brink2@llnl.gov>
Date: Wed, 14 Oct 2026 09:32:13 -0700
Subject: [PATCH] Dockerfile.benchpark no longer exists

---
 .github/workflows/push_images.yml       |  70 ------
 .github/workflows/test_build_images.yml | 307 ------------------------
 2 files changed, 377 deletions(-)

diff --git a/.github/workflows/push_images.yml b/.github/workflows/push_images.yml
index d09c13f..77e3faa 100644
--- a/.github/workflows/push_images.yml
+++ b/.github/workflows/push_images.yml
@@ -27,79 +27,9 @@ jobs:
           matrix_data='{"docker_os": ["linux"], "docker_arch": ["amd64"]}'
           echo "matrix_data=$matrix_data" >> "$GITHUB_OUTPUT"
 
-  build_benchpark_container:
-    needs:
-      - setup_shared_matrix
-    runs-on: ubuntu-latest
-
-    strategy:
-      fail-fast: true
-      matrix:
-        tag:
-          - ${{ github.event.inputs.tag }}
-        tutorial_dir:
-          - ${{ github.event.inputs.tutorial_dir }}
-        docker_os: ${{ fromJson(needs.setup_shared_matrix.outputs.matrix_data).docker_os }}
-        docker_arch: ${{ fromJson(needs.setup_shared_matrix.outputs.matrix_data).docker_arch }}
-        containers_to_build:
-          - ["docker/Dockerfile.benchpark", "ghcr.io/llnl/benchpark"]
-
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        submodules: "recursive"
-
-    - name: Remove unneeded stuff to make space for container
-      uses: jlumbroso/free-disk-space@v1.3.1
-      with:
-        tool-cache: true
-        android: true
-        dotnet: true
-        haskell: true
-        large-packages: true
-        docker-images: false
-        swap-storage: true
-
-    - name: Set up Docker
-      uses: docker/setup-docker-action@v4
-
-    - name: Set up QEMU
-      uses: docker/setup-qemu-action@v3
-
-    - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v3
-
-    - name: Login to GHCR
-      uses: docker/login-action@v2
-      with:
-        registry: ghcr.io
-        username: ${{ github.actor }}
-        password: ${{ secrets.GITHUB_TOKEN }}
-
-    - name: Pull layers if they exist
-      env:
-        container: "${{ matrix.containers_to_build[1] }}:${{ matrix.tag }}"
-      run: docker pull ${container} || echo "${container} has not yet been pushed"
-
-    - name: Build container
-      env:
-        context: ${{ matrix.tutorial_dir }}
-        dockerfile: ${{ matrix.containers_to_build[0] }}
-        container: "${{ matrix.containers_to_build[1] }}:${{ matrix.tag }}"
-        platform: "${{ matrix.docker_os }}/${{ matrix.docker_arch }}"
-      run: |
-        cd ${context}
-        docker build --progress=plain --platform ${platform} -f ${dockerfile} -t ${container} .
-
-    - name: Deploy container
-      env:
-        container: "${{ matrix.containers_to_build[1] }}:${{ matrix.tag }}"
-      run: docker push ${container}
-
   build_spawn_container:
     needs:
       - setup_shared_matrix
-      - build_benchpark_container
     runs-on: ubuntu-latest
 
     strategy:
diff --git a/.github/workflows/test_build_images.yml b/.github/workflows/test_build_images.yml
index e170314..a445267 100644
--- a/.github/workflows/test_build_images.yml
+++ b/.github/workflows/test_build_images.yml
@@ -22,316 +22,9 @@ jobs:
         matrix_data="$(cat github_ci_matrix.json | jq -c)"
         echo "matrix_data=$matrix_data" >> "$GITHUB_OUTPUT"
 
-  build_caliper_container:
-    needs: setup_shared_matrix
-    runs-on: ubuntu-latest
-
-    strategy:
-      fail-fast: true
-      matrix:
-        tag: ${{ fromJson(needs.setup_shared_matrix.outputs.matrix_data).tag }}
-        tutorial_dir: ${{ fromJson(needs.setup_shared_matrix.outputs.matrix_data).tutorial_dir }}
-        docker_os: ${{ fromJson(needs.setup_shared_matrix.outputs.matrix_data).docker_os }}
-        docker_arch: ${{ fromJson(needs.setup_shared_matrix.outputs.matrix_data).docker_arch }}
-        containers_to_build:
-          - ["docker/Dockerfile.caliper", "ghcr.io/llnl/caliper"]
-
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        submodules: "recursive"
-
-    - name: Remove unneeded stuff to make space for container
-      uses: jlumbroso/free-disk-space@v1.3.1
-      with:
-        tool-cache: true
-        android: true
-        dotnet: true
-        haskell: true
-        large-packages: true
-        docker-images: false
-        swap-storage: true
-
-    - name: Set up Docker
-      uses: docker/setup-docker-action@v4
-
-    - name: Set up QEMU
-      uses: docker/setup-qemu-action@v3
-
-    - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v3
-
-    - name: Pull layers if they exist
-      env:
-        container: "${{ matrix.containers_to_build[1] }}:${{ matrix.tag }}"
-      run: docker pull ${container} || echo "${container} has not yet been pushed"
-
-    - name: Build container
-      env:
-        context: ${{ matrix.tutorial_dir }}
-        dockerfile: ${{ matrix.containers_to_build[0] }}
-        container: "${{ matrix.containers_to_build[1] }}:${{ matrix.tag }}"
-        platform: "${{ matrix.docker_os }}/${{ matrix.docker_arch }}"
-      run: |
-        cd ${context}
-        docker build --progress=plain --platform ${platform} -f ${dockerfile} -t ${container} .
-
-    - name: Save container to tarball
-      env:
-        container: "${{ matrix.containers_to_build[1] }}:${{ matrix.tag }}"
-        tar_dest: "${{ runner.temp }}/caliper_${{ matrix.docker_arch }}.tar"
-      run: docker save -o ${tar_dest} ${container}
-
-    - name: Upload tarball as artifact to be used in downstream jobs
-      uses: actions/upload-artifact@v4
-      with:
-        name: caliper_image_${{ matrix.docker_arch }}
-        path: ${{ runner.temp }}/caliper_${{ matrix.docker_arch }}.tar
-
-  build_thicket_container:
-    needs:
-      - setup_shared_matrix
-      - build_caliper_container
-    runs-on: ubuntu-latest
-
-    strategy:
-      fail-fast: true
-      matrix:
-        tag: ${{ fromJson(needs.setup_shared_matrix.outputs.matrix_data).tag }}
-        tutorial_dir: ${{ fromJson(needs.setup_shared_matrix.outputs.matrix_data).tutorial_dir }}
-        docker_os: ${{ fromJson(needs.setup_shared_matrix.outputs.matrix_data).docker_os }}
-        docker_arch: ${{ fromJson(needs.setup_shared_matrix.outputs.matrix_data).docker_arch }}
-        containers_to_build:
-          - ["docker/Dockerfile.thicket", "ghcr.io/llnl/thicket"]
-
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        submodules: "recursive"
-
-    - name: Remove unneeded stuff to make space for container
-      uses: jlumbroso/free-disk-space@v1.3.1
-      with:
-        tool-cache: true
-        android: true
-        dotnet: true
-        haskell: true
-        large-packages: true
-        docker-images: false
-        swap-storage: true
-
-    - name: Set up Docker
-      uses: docker/setup-docker-action@v4
-
-    - name: Set up QEMU
-      uses: docker/setup-qemu-action@v3
-
-    - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v3
-
-    - name: Download Caliper image
-      uses: actions/download-artifact@v4
-      with:
-        name: caliper_image_${{ matrix.docker_arch }}
-        path: ${{ runner.temp }}
-
-    - name: Load Caliper image
-      env:
-        DEPENDENCY_IMAGE_TAR: ${{ runner.temp }}/caliper_${{ matrix.docker_arch }}.tar
-      run: |
-        docker load --input ${DEPENDENCY_IMAGE_TAR}
-        docker image ls -a
-    - name: Pull layers if they exist
-      env:
-        container: "${{ matrix.containers_to_build[1] }}:${{ matrix.tag }}"
-      run: docker pull ${container} || echo "${container} has not yet been pushed"
-
-    - name: Build container
-      env:
-        context: ${{ matrix.tutorial_dir }}
-        dockerfile: ${{ matrix.containers_to_build[0] }}
-        container: "${{ matrix.containers_to_build[1] }}:${{ matrix.tag }}"
-        platform: "${{ matrix.docker_os }}/${{ matrix.docker_arch }}"
-      run: |
-        cd ${context}
-        docker build --progress=plain --platform ${platform} -f ${dockerfile} -t ${container} .
-
-    - name: Save container to tarball
-      env:
-        container: "${{ matrix.containers_to_build[1] }}:${{ matrix.tag }}"
-        tar_dest: "${{ runner.temp }}/thicket_${{ matrix.docker_arch }}.tar"
-      run: docker save -o ${tar_dest} ${container}
-
-    - name: Upload tarball as artifact to be used in downstream jobs
-      uses: actions/upload-artifact@v4
-      with:
-        name: thicket_image_${{ matrix.docker_arch }}
-        path: ${{ runner.temp }}/thicket_${{ matrix.docker_arch }}.tar
-
-  build_treescape_container:
-    needs:
-      - setup_shared_matrix
-      - build_thicket_container
-    runs-on: ubuntu-latest
-
-    strategy:
-      fail-fast: true
-      matrix:
-        tag: ${{ fromJson(needs.setup_shared_matrix.outputs.matrix_data).tag }}
-        tutorial_dir: ${{ fromJson(needs.setup_shared_matrix.outputs.matrix_data).tutorial_dir }}
-        docker_os: ${{ fromJson(needs.setup_shared_matrix.outputs.matrix_data).docker_os }}
-        docker_arch: ${{ fromJson(needs.setup_shared_matrix.outputs.matrix_data).docker_arch }}
-        containers_to_build:
-          - ["docker/Dockerfile.treescape", "ghcr.io/llnl/treescape"]
-
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        submodules: "recursive"
-
-    - name: Remove unneeded stuff to make space for container
-      uses: jlumbroso/free-disk-space@v1.3.1
-      with:
-        tool-cache: true
-        android: true
-        dotnet: true
-        haskell: true
-        large-packages: true
-        docker-images: false
-        swap-storage: true
-
-    - name: Set up Docker
-      uses: docker/setup-docker-action@v4
-
-    - name: Set up QEMU
-      uses: docker/setup-qemu-action@v3
-
-    - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v3
-
-    - name: Download Thicket image
-      uses: actions/download-artifact@v4
-      with:
-        name: thicket_image_${{ matrix.docker_arch }}
-        path: ${{ runner.temp }}
-
-    - name: Load Thicket image
-      env:
-        DEPENDENCY_IMAGE_TAR: ${{ runner.temp }}/thicket_${{ matrix.docker_arch }}.tar
-      run: |
-        docker load --input ${DEPENDENCY_IMAGE_TAR}
-        docker image ls -a
-    - name: Pull layers if they exist
-      env:
-        container: "${{ matrix.containers_to_build[1] }}:${{ matrix.tag }}"
-      run: docker pull ${container} || echo "${container} has not yet been pushed"
-
-    - name: Build container
-      env:
-        context: ${{ matrix.tutorial_dir }}
-        dockerfile: ${{ matrix.containers_to_build[0] }}
-        container: "${{ matrix.containers_to_build[1] }}:${{ matrix.tag }}"
-        platform: "${{ matrix.docker_os }}/${{ matrix.docker_arch }}"
-      run: |
-        cd ${context}
-        docker build --progress=plain --platform ${platform} -f ${dockerfile} -t ${container} .
-
-    - name: Save container to tarball
-      env:
-        container: "${{ matrix.containers_to_build[1] }}:${{ matrix.tag }}"
-        tar_dest: "${{ runner.temp }}/treescape_${{ matrix.docker_arch }}.tar"
-      run: docker save -o ${tar_dest} ${container}
-
-    - name: Upload tarball as artifact to be used in downstream jobs
-      uses: actions/upload-artifact@v4
-      with:
-        name: treescape_image_${{ matrix.docker_arch }}
-        path: ${{ runner.temp }}/treescape_${{ matrix.docker_arch }}.tar
-
-  build_benchpark_container:
-    needs:
-      - setup_shared_matrix
-      - build_treescape_container
-    runs-on: ubuntu-latest
-
-    strategy:
-      fail-fast: true
-      matrix:
-        tag: ${{ fromJson(needs.setup_shared_matrix.outputs.matrix_data).tag }}
-        tutorial_dir: ${{ fromJson(needs.setup_shared_matrix.outputs.matrix_data).tutorial_dir }}
-        docker_os: ${{ fromJson(needs.setup_shared_matrix.outputs.matrix_data).docker_os }}
-        docker_arch: ${{ fromJson(needs.setup_shared_matrix.outputs.matrix_data).docker_arch }}
-        containers_to_build:
-          - ["docker/Dockerfile.benchpark", "ghcr.io/llnl/benchpark"]
-
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        submodules: "recursive"
-
-    - name: Remove unneeded stuff to make space for container
-      uses: jlumbroso/free-disk-space@v1.3.1
-      with:
-        tool-cache: true
-        android: true
-        dotnet: true
-        haskell: true
-        large-packages: true
-        docker-images: false
-        swap-storage: true
-
-    - name: Set up Docker
-      uses: docker/setup-docker-action@v4
-
-    - name: Set up QEMU
-      uses: docker/setup-qemu-action@v3
-
-    - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v3
-
-    - name: Download Treescape image
-      uses: actions/download-artifact@v4
-      with:
-        name: treescape_image_${{ matrix.docker_arch }}
-        path: ${{ runner.temp }}
-
-    - name: Load Treescape Thicket image
-      env:
-        DEPENDENCY_IMAGE_TAR: ${{ runner.temp }}/treescape_${{ matrix.docker_arch }}.tar
-      run: |
-        docker load --input ${DEPENDENCY_IMAGE_TAR}
-        docker image ls -a
-    - name: Pull layers if they exist
-      env:
-        container: "${{ matrix.containers_to_build[1] }}:${{ matrix.tag }}"
-      run: docker pull ${container} || echo "${container} has not yet been pushed"
-
-    - name: Build container
-      env:
-        context: ${{ matrix.tutorial_dir }}
-        dockerfile: ${{ matrix.containers_to_build[0] }}
-        container: "${{ matrix.containers_to_build[1] }}:${{ matrix.tag }}"
-        platform: "${{ matrix.docker_os }}/${{ matrix.docker_arch }}"
-      run: |
-        cd ${context}
-        docker build --progress=plain --platform ${platform} -f ${dockerfile} -t ${container} .
-
-    - name: Save container to tarball
-      env:
-        container: "${{ matrix.containers_to_build[1] }}:${{ matrix.tag }}"
-        tar_dest: "${{ runner.temp }}/benchpark_${{ matrix.docker_arch }}.tar"
-      run: docker save -o ${tar_dest} ${container}
-
-    - name: Upload tarball as artifact to be used in downstream jobs
-      uses: actions/upload-artifact@v4
-      with:
-        name: benchpark_image_${{ matrix.docker_arch }}
-        path: ${{ runner.temp }}/benchpark_${{ matrix.docker_arch }}.tar
-
   build_spawn_container:
     needs:
       - setup_shared_matrix
-      - build_benchpark_container
     runs-on: ubuntu-latest
 
     strategy: