From 4de96cf22ea45170b38b52d60452d78553482a38 Mon Sep 17 00:00:00 2001 From: Erica Portnoy Date: Tue, 24 Mar 2026 11:24:00 -0700 Subject: [PATCH] only run snaps tests --- .github/workflows/packaging_jobs.yml | 130 +++++++++---------- .github/workflows/test_and_package_stage.yml | 22 ++-- 2 files changed, 76 insertions(+), 76 deletions(-) diff --git a/.github/workflows/packaging_jobs.yml b/.github/workflows/packaging_jobs.yml index bdc552028..a5f4a6c52 100644 --- a/.github/workflows/packaging_jobs.yml +++ b/.github/workflows/packaging_jobs.yml @@ -15,71 +15,71 @@ env: snapBuildTimeout: ${{ inputs.snapBuildTimeout }} jobs: - docker_build: - runs-on: - - ubuntu-24.04 - # The default timeout of 60 minutes is a little low for compiling - # cryptography on ARM architectures. - timeout-minutes: 180 - strategy: - fail-fast: false - matrix: - DOCKER_ARCH: - - arm32v6 - - arm64v8 - - amd64 - steps: - - name: checkout - uses: actions/checkout@v6.0.2 - - name: Build the Docker images - # We don't filter for the Docker Hub organization to continue to allow - # easy testing of these scripts on forks. - run: set -e && tools/docker/build.sh ${{ env.dockerTag }} ${{ matrix.DOCKER_ARCH }} - shell: bash - - name: Save the Docker images - run: |- - set -e - DOCKER_IMAGES=$(docker images --filter reference='*/certbot' --filter reference='*/dns-*' --format '{{.Repository}}') - docker save --output images.tar $DOCKER_IMAGES - shell: bash - # If the name of the tar file or artifact changes, the deploy stage will - # also need to be updated. - - name: Prepare Docker artifact - run: set -e && mv images.tar ${{ runner.temp }} - shell: bash - - name: Store Docker artifact - uses: actions/upload-artifact@v4.1.0 - with: - name: docker_${{ matrix.DOCKER_ARCH }} - path: "${{ runner.temp }}" - docker_test: - needs: - - docker_build - runs-on: - - ubuntu-22.04 - strategy: - fail-fast: false - matrix: - DOCKER_ARCH: - - arm32v6 - - arm64v8 - - amd64 - steps: - - name: checkout - uses: actions/checkout@v6.0.2 - - name: Retrieve Docker images - uses: actions/download-artifact@v8.0.1 - with: - name: docker_${{ matrix.DOCKER_ARCH }} - github_token: "${{ secrets.GITHUB_TOKEN }}" - path: "${{ github.workspace }}" - repo: "${{ github.repository }}" - - name: Load Docker images - run: set -e && docker load --input ${{ github.workspace }}/images.tar - shell: bash - - name: Run integration tests for Docker images - run: set -e && tools/docker/test.sh ${{ env.dockerTag }} ${{ matrix.DOCKER_ARCH }} - shell: bash + # docker_build: + # runs-on: + # - ubuntu-24.04 + # # The default timeout of 60 minutes is a little low for compiling + # # cryptography on ARM architectures. + # timeout-minutes: 180 + # strategy: + # fail-fast: false + # matrix: + # DOCKER_ARCH: + # - arm32v6 + # - arm64v8 + # - amd64 + # steps: + # - name: checkout + # uses: actions/checkout@v6.0.2 + # - name: Build the Docker images + # # We don't filter for the Docker Hub organization to continue to allow + # # easy testing of these scripts on forks. + # run: set -e && tools/docker/build.sh ${{ env.dockerTag }} ${{ matrix.DOCKER_ARCH }} + # shell: bash + # - name: Save the Docker images + # run: |- + # set -e + # DOCKER_IMAGES=$(docker images --filter reference='*/certbot' --filter reference='*/dns-*' --format '{{.Repository}}') + # docker save --output images.tar $DOCKER_IMAGES + # shell: bash + # # If the name of the tar file or artifact changes, the deploy stage will + # # also need to be updated. + # - name: Prepare Docker artifact + # run: set -e && mv images.tar ${{ runner.temp }} + # shell: bash + # - name: Store Docker artifact + # uses: actions/upload-artifact@v4.1.0 + # with: + # name: docker_${{ matrix.DOCKER_ARCH }} + # path: "${{ runner.temp }}" + # docker_test: + # needs: + # - docker_build + # runs-on: + # - ubuntu-22.04 + # strategy: + # fail-fast: false + # matrix: + # DOCKER_ARCH: + # - arm32v6 + # - arm64v8 + # - amd64 + # steps: + # - name: checkout + # uses: actions/checkout@v6.0.2 + # - name: Retrieve Docker images + # uses: actions/download-artifact@v8.0.1 + # with: + # name: docker_${{ matrix.DOCKER_ARCH }} + # github_token: "${{ secrets.GITHUB_TOKEN }}" + # path: "${{ github.workspace }}" + # repo: "${{ github.repository }}" + # - name: Load Docker images + # run: set -e && docker load --input ${{ github.workspace }}/images.tar + # shell: bash + # - name: Run integration tests for Docker images + # run: set -e && tools/docker/test.sh ${{ env.dockerTag }} ${{ matrix.DOCKER_ARCH }} + # shell: bash snaps_build: runs-on: - ubuntu-22.04 diff --git a/.github/workflows/test_and_package_stage.yml b/.github/workflows/test_and_package_stage.yml index 1e74eceb5..56e881646 100644 --- a/.github/workflows/test_and_package_stage.yml +++ b/.github/workflows/test_and_package_stage.yml @@ -11,17 +11,17 @@ on: type: number jobs: - standard_tests_jobs: - name: standard_tests_jobs - uses: "./.github/workflows/standard_tests_jobs.yml" - permissions: - contents: read - extended_tests_jobs: - name: extended_tests_jobs - uses: "./.github/workflows/extended_tests_jobs.yml" - permissions: - contents: read - secrets: inherit + # standard_tests_jobs: + # name: standard_tests_jobs + # uses: "./.github/workflows/standard_tests_jobs.yml" + # permissions: + # contents: read + # extended_tests_jobs: + # name: extended_tests_jobs + # uses: "./.github/workflows/extended_tests_jobs.yml" + # permissions: + # contents: read + # secrets: inherit packaging_jobs: name: packaging_jobs uses: "./.github/workflows/packaging_jobs.yml"