Skip to content

Commit

Permalink
move fixture publishing to its own gha
Browse files Browse the repository at this point in the history
Signed-off-by: Per Goncalves da Silva <[email protected]>
  • Loading branch information
Per Goncalves da Silva committed Jun 14, 2024
1 parent a5a75f4 commit 442c42d
Show file tree
Hide file tree
Showing 4 changed files with 35 additions and 25 deletions.
33 changes: 33 additions & 0 deletions .github/workflows/fixtures.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
name: fixtures
on:
push:
branches:
- master
jobs:
rebuild:
if: ${{ needs.build.outputs.UPDATE_FIXTURES == 'true' && success() }}
needs: e2e-tests
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version-file: "go.mod"
- name: Docker Login
uses: docker/login-action@v3
with:
registry: quay.io
username: ${{ secrets.QUAY_USERNAME }}
password: ${{ secrets.QUAY_PASSWORD }}
- name: Download build artifacts
uses: actions/download-artifact@v4
with:
name: docker-images
path: images/
- name: Load Docker images
run: |
for image in images/*.tar.gz; do
docker load -i $image
done
- name: Push fixture images
run: scripts/e2e_test_fixtures.sh --push --skip-build
2 changes: 1 addition & 1 deletion pkg/lib/image/image.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ func InferImagePullPolicy(image string) corev1.PullPolicy {
// Ensure test registry images are pulled only if needed
// These will normally be loaded through kind load docker-image
// This is also helps support the e2e fixture image re-build flow (see e2e GHA)
if strings.HasPrefix(image, "quay.io/olmtest/") {
if strings.HasPrefix(image, "quay.io/olmtest/test-catalog") {
return corev1.PullIfNotPresent
}
return corev1.PullAlways
Expand Down
19 changes: 0 additions & 19 deletions scripts/build_test_images.sh

This file was deleted.

6 changes: 1 addition & 5 deletions vendor/modules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -271,9 +271,6 @@ github.com/go-air/gini/inter
github.com/go-air/gini/internal/xo
github.com/go-air/gini/logic
github.com/go-air/gini/z
<<<<<<< HEAD
# github.com/go-logr/logr v1.4.2
=======
# github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376
## explicit; go 1.13
github.com/go-git/gcfg
Expand All @@ -289,8 +286,7 @@ github.com/go-git/go-git/v5/internal/path_util
github.com/go-git/go-git/v5/plumbing/format/config
github.com/go-git/go-git/v5/plumbing/format/gitignore
github.com/go-git/go-git/v5/utils/ioutil
# github.com/go-logr/logr v1.4.1
>>>>>>> 2452c2f43 (add opm to tools)
# github.com/go-logr/logr v1.4.2
## explicit; go 1.18
github.com/go-logr/logr
github.com/go-logr/logr/funcr
Expand Down

0 comments on commit 442c42d

Please sign in to comment.