Merge branch 'main' into multiplat

Author: sheurich

.github/workflows/release.yml

@@ -29,12 +29,15 @@ jobs:
       - name: Verify release ancestry
         run: ./tools/verify-release-ancestry.sh "$GITHUB_SHA"
 
-      - name: Build .deb
+      - name: Build Boulder container and .deb
         id: build
         env:
           GO_VERSION: ${{ matrix.GO_VERSION }}
         run: ./tools/container-build.sh
 
+      - name: Tag Boulder container
+        run: docker tag boulder "ghcr.io/letsencrypt/boulder:${{ github.ref_name }}-go${{ matrix.GO_VERSION }}"
+
       - name: Compute checksums
         id: checksums
         # The files listed on this line must be identical to the files uploaded
@@ -54,13 +57,16 @@ jobs:
         # https://cli.github.com/manual/gh_release_upload
         run: gh release upload "${GITHUB_REF_NAME}" boulder*.deb boulder*.tar.gz boulder*.checksums.txt
 
-      - name: Build ct-test-srv Container
+      - name: Build ct-test-srv container
         run: docker buildx build . --build-arg "GO_VERSION=${{ matrix.GO_VERSION }}" -f test/ct-test-srv/Dockerfile -t "ghcr.io/letsencrypt/ct-test-srv:${{ github.ref_name }}-go${{ matrix.GO_VERSION }}"
 
       - name: Login to ghcr.io
         run: printenv GITHUB_TOKEN | docker login ghcr.io -u "${{ github.actor }}" --password-stdin
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Push ct-test-srv Container
+      - name: Push Boulder container
+        run: docker push "ghcr.io/letsencrypt/boulder:${{ github.ref_name }}-go${{ matrix.GO_VERSION }}"
+
+      - name: Push ct-test-srv container
         run: docker push "ghcr.io/letsencrypt/ct-test-srv:${{ github.ref_name }}-go${{ matrix.GO_VERSION }}"

.github/workflows/try-release.yml

@@ -26,7 +26,7 @@ jobs:
         with:
           persist-credentials: false
 
-      - name: Build .deb
+      - name: Build Boulder container and .deb
         id: build
         env:
           GO_VERSION: ${{ matrix.GO_VERSION }}
@@ -46,5 +46,5 @@ jobs:
         id: check
         run: cat boulder*.checksums.txt
 
-      - name: Build ct-test-srv Container
+      - name: Build ct-test-srv container
         run: docker buildx build . --build-arg "GO_VERSION=${{ matrix.GO_VERSION }}" -f test/ct-test-srv/Dockerfile -t "ghcr.io/letsencrypt/ct-test-srv:${{ github.sha }}-go${{ matrix.GO_VERSION }}"

README.md

@@ -139,10 +139,10 @@ To run unit tests and integration tests with coverage:
 docker compose run --use-aliases boulder ./test.sh --unit --integration --coverage --coverage-dir=./test/coverage/mytestrun
 ```
 
-To run specific integration tests (example runs TestAkamaiPurgerDrainQueueFails and TestWFECORS):
+To run specific integration tests (example runs TestGenerateValidity and TestWFECORS):
 
 ```shell
-docker compose run --use-aliases boulder ./test.sh --filter TestAkamaiPurgerDrainQueueFails/TestWFECORS
+docker compose run --use-aliases boulder ./test.sh --filter TestGenerateValidity/TestWFECORS
 ```
 
 To get a list of available integration tests: