Skip to content

Commit ced2f20

Browse files
committed
Attempt to use charts from PR project in e2e tests
Signed-off-by: David Cassany <dcassany@suse.com> (cherry picked from commit 722eb25)
1 parent 8a0da95 commit ced2f20

File tree

1 file changed

+29
-14
lines changed

1 file changed

+29
-14
lines changed

.github/workflows/e2e.yaml

Lines changed: 29 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ concurrency:
88

99
jobs:
1010
prepare-build:
11-
name: Prepare chart for PR and wait for image builds
11+
name: Wait for the PR project to build
1212
runs-on: ubuntu-latest
1313
outputs:
1414
chart_name: ${{ steps.chart.outputs.chart_name }}
@@ -17,15 +17,33 @@ jobs:
1717
uses: actions/checkout@v3
1818
with:
1919
fetch-depth: 0
20-
- name: Wait for OBS worflow to start
20+
- name: Wait for OBS crds chart
2121
uses: "./.github/actions/wait-commit-status"
2222
with:
2323
repository: ${{ github.repository }}
2424
commit: ${{ github.event.pull_request.head.sha }}
25-
context: "OBS SCM/CI Workflow Integration started"
25+
context: "OBS: elemental-operator-crds-helm - charts/x86_64"
2626
status: "success"
27-
interval: 30
27+
interval: 60
28+
retries: 10
29+
- name: Wait for OBS operator chart
30+
uses: "./.github/actions/wait-commit-status"
31+
with:
32+
repository: ${{ github.repository }}
33+
commit: ${{ github.event.pull_request.head.sha }}
34+
context: "OBS: elemental-operator-helm - charts/x86_64"
35+
status: "success"
36+
interval: 60
2837
retries: 10
38+
- name: Wait for OBS elemental-operator package
39+
uses: "./.github/actions/wait-commit-status"
40+
with:
41+
repository: ${{ github.repository }}
42+
commit: ${{ github.event.pull_request.head.sha }}
43+
context: "OBS: elemental-operator - standard/x86_64"
44+
status: "success"
45+
interval: 60
46+
retries: 30
2947
- name: Wait for OBS seedimage-builder build
3048
uses: "./.github/actions/wait-commit-status"
3149
with:
@@ -44,19 +62,16 @@ jobs:
4462
status: "success"
4563
interval: 60
4664
retries: 30
47-
- name: Build chart for release
65+
- name: Pull chart for PR
4866
env:
4967
PR_NUMBER: ${{ github.event.number }}
50-
B_REPO: registry.opensuse.org/isv/rancher/elemental/pr/rancher/elemental-operator/pr-${PR_NUMBER}/containers
51-
OPERATOR_REPO: rancher/elemental-operator
52-
SEEDIMAGE_REPO: rancher/seedimage-builder
53-
CHANNEL_REPO: rancher/elemental-teal-channel
68+
B_REPO: registry.opensuse.org/isv/rancher/elemental/pr/rancher/elemental-operator/pr-${PR_NUMBER}/charts
69+
OPERATOR_CHART: rancher/elemental-operator-chart
70+
CRDS_CHART: rancher/elemental-operator-crds-chart
5471
run: |
55-
REGISTRY_URL=${B_REPO} \
56-
REPO=${OPERATOR_REPO} \
57-
REPO_SEEDIMAGE=${SEEDIMAGE_REPO} \
58-
REPO_CHANNEL=${CHANNEL_REPO} \
59-
make chart
72+
mkdir -p build
73+
helm pull --debug -d build oci://${B_REPO}/${CRDS_CHART}
74+
helm pull -d build oci://${B_REPO}/${OPERATOR_CHART}
6075
- name: Set chart output
6176
id: chart
6277
run: |

0 commit comments

Comments
 (0)