mirror of
https://github.com/edgelesssys/constellation.git
synced 2025-02-04 09:05:31 -05:00
ci: fix empty image input of verify e2e on release (#1604)
* ci: fix empty image input of verify e2e on release * ci: increase parallelism of e2e release workflow Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com>
This commit is contained in:
parent
00ced1bbc2
commit
00efc30e24
18
.github/actions/constellation_create/action.yml
vendored
18
.github/actions/constellation_create/action.yml
vendored
@ -67,6 +67,9 @@ outputs:
|
|||||||
masterSecret:
|
masterSecret:
|
||||||
description: "The master-secret for the cluster."
|
description: "The master-secret for the cluster."
|
||||||
value: ${{ steps.constellation-init.outputs.MASTERSECRET }}
|
value: ${{ steps.constellation-init.outputs.MASTERSECRET }}
|
||||||
|
osImageUsed:
|
||||||
|
description: "The OS image used in the cluster."
|
||||||
|
value: ${{ steps.setImage.outputs.image }}
|
||||||
|
|
||||||
runs:
|
runs:
|
||||||
using: "composite"
|
using: "composite"
|
||||||
@ -132,11 +135,20 @@ runs:
|
|||||||
constellation-conf.yaml
|
constellation-conf.yaml
|
||||||
|
|
||||||
- name: Set image
|
- name: Set image
|
||||||
if: inputs.osImage != ''
|
id: setImage
|
||||||
shell: bash
|
shell: bash
|
||||||
env:
|
env:
|
||||||
image: ${{ inputs.osImage }}
|
imageInput: ${{ inputs.osImage }}
|
||||||
run: yq eval -i "(.image) = \"${image}\"" constellation-conf.yaml
|
run: |
|
||||||
|
if [[ -z "${imageInput}" ]]; then
|
||||||
|
echo "No image specified. Using default image from config."
|
||||||
|
image=$(yq eval ".image" constellation-conf.yaml)
|
||||||
|
echo "image=${image}" | tee -a "$GITHUB_OUTPUT"
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
yq eval -i "(.image) = \"${imageInput}\"" constellation-conf.yaml
|
||||||
|
echo "image=${imageInput}" | tee -a "$GITHUB_OUTPUT"
|
||||||
|
|
||||||
- name: Set instanceType
|
- name: Set instanceType
|
||||||
if: inputs.machineType && inputs.machineType != 'default'
|
if: inputs.machineType && inputs.machineType != 'default'
|
||||||
|
2
.github/actions/e2e_test/action.yml
vendored
2
.github/actions/e2e_test/action.yml
vendored
@ -260,7 +260,7 @@ runs:
|
|||||||
uses: ./.github/actions/e2e_verify
|
uses: ./.github/actions/e2e_verify
|
||||||
with:
|
with:
|
||||||
cloudProvider: ${{ inputs.cloudProvider }}
|
cloudProvider: ${{ inputs.cloudProvider }}
|
||||||
osImage: ${{ inputs.osImage }}
|
osImage: ${{ steps.constellation-create.outputs.osImageUsed }}
|
||||||
|
|
||||||
- name: Run recover test
|
- name: Run recover test
|
||||||
if: inputs.test == 'recover'
|
if: inputs.test == 'recover'
|
||||||
|
5
.github/workflows/e2e-test-release.yml
vendored
5
.github/workflows/e2e-test-release.yml
vendored
@ -35,7 +35,7 @@ jobs:
|
|||||||
e2e-tests:
|
e2e-tests:
|
||||||
strategy:
|
strategy:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
max-parallel: 4
|
max-parallel: 9
|
||||||
matrix:
|
matrix:
|
||||||
test:
|
test:
|
||||||
[
|
[
|
||||||
@ -211,8 +211,7 @@ jobs:
|
|||||||
fail-fast: false
|
fail-fast: false
|
||||||
max-parallel: 1
|
max-parallel: 1
|
||||||
matrix:
|
matrix:
|
||||||
fromVersion:
|
fromVersion: ["v2.6.0"]
|
||||||
["v2.6.0"]
|
|
||||||
cloudProvider: ["gcp", "azure"]
|
cloudProvider: ["gcp", "azure"]
|
||||||
name: Run upgrade tests
|
name: Run upgrade tests
|
||||||
secrets: inherit
|
secrets: inherit
|
||||||
|
Loading…
x
Reference in New Issue
Block a user