Skip to content

Commit a365dd2

Browse files
authored
[backport] ci: add LOAD_IMAGES_INTO_CLUSTER variable to control image loading behavior (#911) (#913)
1 parent ceb4cad commit a365dd2

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

.github/workflows/e2e.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ env:
4242
FSM_CLI_ARTIFACTS_NAME: ${{ vars.FSM_CLI_ARTIFACTS_NAME || 'fsm-cli' }}
4343
CTR_REGISTRY: ${{ vars.CI_CTR_REGISTRY || 'localhost:5000' }}
4444
CTR_TAG: ${{ github.sha }}
45+
LOAD_IMAGES_INTO_CLUSTER: ${{ vars.LOAD_IMAGES_INTO_CLUSTER || 'false' }}
4546

4647
permissions:
4748
contents: read
@@ -104,11 +105,11 @@ jobs:
104105
chmod a+x ./bin/fsm
105106
ls -l ./bin/fsm
106107
- name: Create k3d managed local registry
107-
if: ${{ env.INCREASE_K3D_CIDR_RANGE != 'true' }}
108+
if: ${{ env.LOAD_IMAGES_INTO_CLUSTER != 'true' }}
108109
run: |
109110
k3d registry create registry.localhost --port localhost:5000
110111
- name: Push images to local registry
111-
if: ${{ env.INCREASE_K3D_CIDR_RANGE != 'true' }}
112+
if: ${{ env.LOAD_IMAGES_INTO_CLUSTER != 'true' }}
112113
run: |
113114
docker image list --format "{{.Repository}}:{{.Tag}}" | grep "^localhost" | xargs --no-run-if-empty -L 1 docker push
114115
- name: Run tests
@@ -137,6 +138,7 @@ jobs:
137138
with:
138139
name: ${{ env.ARTIFACT_NAME }}
139140
path: /tmp/test**/*
141+
if-no-files-found: ignore
140142
- name: Check continue tests
141143
if: ${{ steps.test.conclusion != 'skipped' && steps.test.outcome == 'failure'}}
142144
run: exit 1

tests/e2e/e2e_retry_policy_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ var _ = FSMDescribe("Test Retry Policy",
5353
SimplePodAppDef{
5454
PodName: server,
5555
Namespace: server,
56-
Image: "mccutchen/go-httpbin",
56+
Image: "ghcr.io/mccutchen/go-httpbin",
5757
Ports: []int{80},
5858
OS: Td.ClusterOS,
5959
Command: []string{"/bin/go-httpbin"},

0 commit comments

Comments
 (0)