Skip to content

Commit f54a7a6

Browse files
authored
fix(release): provide conformance binary to e2e (#3097)
Signed-off-by: Simon Scatton <sscatton@nvidia.com>
1 parent d5742e0 commit f54a7a6

2 files changed

Lines changed: 62 additions & 6 deletions

File tree

.github/workflows/release-dev.yml

Lines changed: 31 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,30 @@ jobs:
6363
image-tag: dev
6464
secrets: inherit
6565

66+
build-conformance:
67+
needs: compute-versions
68+
permissions:
69+
contents: read
70+
strategy:
71+
matrix:
72+
include:
73+
- triple: x86_64-unknown-linux-musl
74+
runner: linux-amd64-cpu8
75+
dev_shell: .#devShells.x86_64-linux.musl
76+
- triple: aarch64-unknown-linux-musl
77+
runner: linux-arm64-cpu8
78+
dev_shell: .#devShells.aarch64-linux.musl
79+
uses: ./.github/workflows/build-binaries.yml
80+
with:
81+
package: openshell-conformance-cli
82+
binary: openshell-conformance
83+
artifact-name: openshell-conformance-${{ matrix.triple }}
84+
triple: ${{ matrix.triple }}
85+
runner: ${{ matrix.runner }}
86+
dev-shell: ${{ matrix.dev_shell }}
87+
cargo-version: ${{ needs.compute-versions.outputs.cargo_version }}
88+
secrets: inherit
89+
6690
build-gateway:
6791
needs: compute-versions
6892
permissions:
@@ -125,7 +149,7 @@ jobs:
125149
secrets: inherit
126150

127151
docker-e2e:
128-
needs: [build-cli, build-gateway, build-supervisor-image]
152+
needs: [build-cli, build-conformance, build-gateway, build-supervisor-image]
129153
permissions:
130154
actions: read
131155
contents: read
@@ -134,24 +158,28 @@ jobs:
134158
with:
135159
image-tag: ${{ github.sha }}
136160
runner: linux-arm64-cpu8
161+
conformance-artifact-prefix: openshell-conformance
137162

138163
podman-e2e:
139-
needs: [build-cli, build-gateway, build-supervisor-image]
164+
needs: [build-cli, build-conformance, build-gateway, build-supervisor-image]
140165
permissions:
141166
actions: read
142167
contents: read
143168
packages: read
144169
uses: ./.github/workflows/e2e-podman-test.yml
145170
with:
146171
image-tag: ${{ github.sha }}
172+
conformance-artifact-prefix: openshell-conformance
147173

148174
vm-e2e:
149-
needs: [build-cli, build-gateway, build-vm-driver]
175+
needs: [build-cli, build-conformance, build-gateway, build-vm-driver]
150176
permissions:
151177
actions: read
152178
contents: read
153179
packages: read
154180
uses: ./.github/workflows/e2e-vm-test.yml
181+
with:
182+
conformance-artifact-prefix: openshell-conformance
155183

156184
tag-ghcr-dev:
157185
name: Tag GHCR Images as Dev

.github/workflows/release-tag.yml

Lines changed: 31 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,31 @@ jobs:
9696
checkout-ref: ${{ inputs.tag || github.ref }}
9797
secrets: inherit
9898

99+
build-conformance:
100+
needs: compute-versions
101+
permissions:
102+
contents: read
103+
strategy:
104+
matrix:
105+
include:
106+
- triple: x86_64-unknown-linux-musl
107+
runner: linux-amd64-cpu8
108+
dev_shell: .#devShells.x86_64-linux.musl
109+
- triple: aarch64-unknown-linux-musl
110+
runner: linux-arm64-cpu8
111+
dev_shell: .#devShells.aarch64-linux.musl
112+
uses: ./.github/workflows/build-binaries.yml
113+
with:
114+
package: openshell-conformance-cli
115+
binary: openshell-conformance
116+
artifact-name: openshell-conformance-${{ matrix.triple }}
117+
triple: ${{ matrix.triple }}
118+
runner: ${{ matrix.runner }}
119+
dev-shell: ${{ matrix.dev_shell }}
120+
cargo-version: ${{ needs.compute-versions.outputs.cargo_version }}
121+
checkout-ref: ${{ inputs.tag || github.ref }}
122+
secrets: inherit
123+
99124
build-gateway:
100125
needs: compute-versions
101126
permissions:
@@ -165,7 +190,7 @@ jobs:
165190
secrets: inherit
166191

167192
docker-e2e:
168-
needs: [compute-versions, build-cli, build-gateway, build-supervisor-image]
193+
needs: [compute-versions, build-cli, build-conformance, build-gateway, build-supervisor-image]
169194
permissions:
170195
actions: read
171196
contents: read
@@ -175,9 +200,10 @@ jobs:
175200
image-tag: ${{ needs.compute-versions.outputs.source_sha }}
176201
checkout-ref: ${{ inputs.tag || github.ref }}
177202
runner: linux-arm64-cpu8
203+
conformance-artifact-prefix: openshell-conformance
178204

179205
podman-e2e:
180-
needs: [compute-versions, build-cli, build-gateway, build-supervisor-image]
206+
needs: [compute-versions, build-cli, build-conformance, build-gateway, build-supervisor-image]
181207
permissions:
182208
actions: read
183209
contents: read
@@ -186,16 +212,18 @@ jobs:
186212
with:
187213
image-tag: ${{ needs.compute-versions.outputs.source_sha }}
188214
checkout-ref: ${{ inputs.tag || github.ref }}
215+
conformance-artifact-prefix: openshell-conformance
189216

190217
vm-e2e:
191-
needs: [compute-versions, build-cli, build-gateway, build-vm-driver]
218+
needs: [compute-versions, build-cli, build-conformance, build-gateway, build-vm-driver]
192219
permissions:
193220
actions: read
194221
contents: read
195222
packages: read
196223
uses: ./.github/workflows/e2e-vm-test.yml
197224
with:
198225
checkout-ref: ${{ inputs.tag || github.ref }}
226+
conformance-artifact-prefix: openshell-conformance
199227

200228
tag-ghcr-release:
201229
name: Tag GHCR Images

0 commit comments

Comments
 (0)