Skip to content

Commit f6753bc

Browse files
odockalodockal
committed
Add option to pass env. vars, secrets and fixes for script names
Signed-off-by: Ondrej Dockal <[email protected]>
1 parent 676b8ef commit f6753bc

File tree

4 files changed

+43
-16
lines changed

4 files changed

+43
-16
lines changed

‎.github/workflows/desktop-e2e-podman-windows-matrix.yaml‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,11 @@ on:
2929
description: 'Podman folder version in archive'
3030
type: 'string'
3131
required: true
32+
env_vars:
33+
default: 'VAR1=xxx,VAR2=true,VAR3=15,VAR4="Pass me along"'
34+
description: 'Env. Variables passed into target machine'
35+
type: 'string'
36+
required: true
3237

3338
jobs:
3439
windows:
@@ -118,7 +123,7 @@ jobs:
118123
-e DEBUG=true \
119124
-v $PWD:/data:z \
120125
quay.io/odockal/pde2e-builder:v0.0.1-windows \
121-
pd-e2e/run.ps1 \
126+
pd-e2e/builder.ps1 \
122127
-targetFolder pd-e2e \
123128
-resultsFolder results \
124129
-fork ${{ env.FORK }} \
@@ -138,7 +143,7 @@ jobs:
138143
-e DEBUG=true \
139144
-v $PWD:/data:z \
140145
quay.io/odockal/pde2e-podman:v0.0.1-windows \
141-
pd-e2e/run.ps1 \
146+
pd-e2e/podman.ps1 \
142147
-downloadUrl "${{ github.event.inputs.podman_remote_url }}" \
143148
-version "${{ github.event.inputs.podman_version }}" \
144149
-targetFolder pd-e2e \
@@ -154,6 +159,8 @@ jobs:
154159
env:
155160
PODMANDESKTOP_CI_BOT_TOKEN: ${{ secrets.PODMANDESKTOP_CI_BOT_TOKEN }}
156161
run: |
162+
# echo "PODMANDESKTOP_CI_BOT_TOKEN=${PODMANDESKTOP_CI_BOT_TOKEN}" > secrets.txt
163+
echo "PODMANDESKTOP_CI_BOT_TOKEN=xxxxxxxx" > secrets.txt
157164
podman run -d --name pde2e-runner-run \
158165
-e TARGET_HOST=$(cat host) \
159166
-e TARGET_HOST_USERNAME=$(cat username) \
@@ -163,8 +170,9 @@ jobs:
163170
-e OUTPUT_FOLDER=/data \
164171
-e DEBUG=true \
165172
-v $PWD:/data:z \
173+
-v $PWD/secrets.txt:/opt/pde2e-runner/secrets.txt:z \
166174
quay.io/odockal/pde2e-runner:v0.0.1-windows \
167-
pd-e2e/run.ps1 \
175+
pd-e2e/runner.ps1 \
168176
-targetFolder pd-e2e \
169177
-resultsFolder results \
170178
-podmanPath $(cat results/podman-location.log) \
@@ -174,7 +182,9 @@ jobs:
174182
-initialize 1 \
175183
-start 1 \
176184
-rootful ${{ matrix.rootful }} \
177-
-userNetworking ${{ matrix.user-networking }}
185+
-userNetworking ${{ matrix.user-networking }} \
186+
-envVars "{{ github.event.inputs.env_vars }}" \
187+
-secretFile secrets.txt
178188
# check logs
179189
podman logs -f pde2e-runner-run
180190

‎.github/workflows/desktop-e2e-test-job-windows.yaml‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ on:
5050
type: 'string'
5151
required: true
5252
env_vars:
53-
default: 'VAR1=xxx,VAR2=true,VAR3=15'
53+
default: 'VAR1=xxx,VAR2=true,VAR3=15,VAR4="Pass me along"'
5454
description: 'Env. Variables passed into target machine'
5555
type: 'string'
5656
required: true
@@ -134,7 +134,7 @@ jobs:
134134
-e DEBUG=true \
135135
-v $PWD:/data:z \
136136
quay.io/odockal/pde2e-builder:v0.0.1-windows \
137-
pd-e2e/run.ps1 \
137+
pd-e2e/builder.ps1 \
138138
-targetFolder pd-e2e \
139139
-resultsFolder results \
140140
-fork ${{ env.FORK }} \
@@ -154,7 +154,7 @@ jobs:
154154
-e DEBUG=true \
155155
-v $PWD:/data:z \
156156
quay.io/odockal/pde2e-podman:v0.0.1-windows \
157-
pd-e2e/run.ps1 \
157+
pd-e2e/podman.ps1 \
158158
-downloadUrl "${{ github.event.inputs.podman_remote_url }}" \
159159
-version "${{ github.event.inputs.podman_version }}" \
160160
-targetFolder pd-e2e \
@@ -170,6 +170,7 @@ jobs:
170170
env:
171171
TEST_SECRET: "MySUPERSecret"
172172
run: |
173+
echo "TEST_SECRET=${TEST_SECRET}" > secrets.txt
173174
podman run -d --name pde2e-runner-run \
174175
-e TARGET_HOST=$(cat host) \
175176
-e TARGET_HOST_USERNAME=$(cat username) \
@@ -179,8 +180,9 @@ jobs:
179180
-e OUTPUT_FOLDER=/data \
180181
-e DEBUG=true \
181182
-v $PWD:/data:z \
183+
-v $PWD/secrets.txt:/opt/pde2e-runner/secrets.txt:z \
182184
quay.io/odockal/pde2e-runner:v0.0.1-windows \
183-
pd-e2e/run.ps1 \
185+
pd-e2e/runner.ps1 \
184186
-targetFolder pd-e2e \
185187
-resultsFolder results \
186188
-podmanPath $(cat results/podman-location.log) \
@@ -192,7 +194,7 @@ jobs:
192194
-start "${{ github.event.inputs.podman_start }}" \
193195
-userNetworking ${{ github.event.inputs.podman_networking }} \
194196
-envVars "{{ github.event.inputs.env_vars }}" \
195-
-registrySecret $TEST_SECRET
197+
-secretFile secrets.txt
196198
# check logs
197199
podman logs -f pde2e-runner-run
198200

‎.github/workflows/podman-desktop-e2e-nightly-windows.yaml‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,11 @@ on:
2020
description: 'npm target to run tests'
2121
type: string
2222
required: true
23+
env_vars:
24+
default: 'VAR1=xxx,VAR2=true,VAR3=15,VAR4="Pass me along"'
25+
description: 'Env. Variables passed into target machine'
26+
type: 'string'
27+
required: true
2328

2429
jobs:
2530
windows:
@@ -104,7 +109,7 @@ jobs:
104109
-e DEBUG=true \
105110
-v $PWD:/data:z \
106111
quay.io/odockal/pde2e-builder:v0.0.1-windows \
107-
pd-e2e/run.ps1 \
112+
pd-e2e/builder.ps1 \
108113
-targetFolder pd-e2e \
109114
-resultsFolder results \
110115
-fork ${{ env.FORK }} \
@@ -124,7 +129,7 @@ jobs:
124129
-e DEBUG=true \
125130
-v $PWD:/data:z \
126131
quay.io/odockal/pde2e-podman:v0.0.1-windows \
127-
pd-e2e/run.ps1 \
132+
pd-e2e/podman.ps1 \
128133
-downloadUrl "https://api.cirrus-ci.com/v1/artifact/github/containers/podman/Artifacts/binary/podman-remote-release-windows_amd64.zip" \
129134
-version '5.0.0-dev' \
130135
-targetFolder pd-e2e \
@@ -140,6 +145,8 @@ jobs:
140145
env:
141146
PODMANDESKTOP_CI_BOT_TOKEN: ${{ secrets.PODMANDESKTOP_CI_BOT_TOKEN }}
142147
run: |
148+
# echo "PODMANDESKTOP_CI_BOT_TOKEN=${PODMANDESKTOP_CI_BOT_TOKEN}" > secrets.txt
149+
echo "PODMANDESKTOP_CI_BOT_TOKEN=xxxxxxxx" > secrets.txt
143150
podman run -d --name pde2e-runner-run \
144151
-e TARGET_HOST=$(cat host) \
145152
-e TARGET_HOST_USERNAME=$(cat username) \
@@ -149,8 +156,9 @@ jobs:
149156
-e OUTPUT_FOLDER=/data \
150157
-e DEBUG=true \
151158
-v $PWD:/data:z \
159+
-v $PWD/secrets.txt:/opt/pde2e-runner/secrets.txt:z \
152160
quay.io/odockal/pde2e-runner:v0.0.1-windows \
153-
pd-e2e/run.ps1 \
161+
pd-e2e/runner.ps1 \
154162
-targetFolder pd-e2e \
155163
-resultsFolder results \
156164
-podmanPath $(cat results/podman-location.log) \
@@ -159,7 +167,9 @@ jobs:
159167
-npmTarget ${{ env.NPM_TARGET }} \
160168
-initialize 1 \
161169
-start 1 \
162-
-rootful 0
170+
-rootful 0 \
171+
-envVars "{{ github.event.inputs.env_vars }}" \
172+
-secretFile secrets.txt
163173
# check logs
164174
podman logs -f pde2e-runner-run
165175

‎.github/workflows/podman-desktop-e2e-windows.yaml‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ jobs:
104104
-e DEBUG=true \
105105
-v $PWD:/data:z \
106106
quay.io/odockal/pde2e-builder:v0.0.1-windows \
107-
pd-e2e/run.ps1 \
107+
pd-e2e/builder.ps1 \
108108
-targetFolder pd-e2e \
109109
-resultsFolder results \
110110
-fork ${{ env.FORK }} \
@@ -138,6 +138,8 @@ jobs:
138138
env:
139139
PODMANDESKTOP_CI_BOT_TOKEN: ${{ secrets.PODMANDESKTOP_CI_BOT_TOKEN }}
140140
run: |
141+
# echo "PODMANDESKTOP_CI_BOT_TOKEN=${PODMANDESKTOP_CI_BOT_TOKEN}" > secrets.txt
142+
echo "PODMANDESKTOP_CI_BOT_TOKEN=xxxxxxxx" > secrets.txt
141143
podman run -d --name pde2e-runner-run \
142144
-e TARGET_HOST=$(cat host) \
143145
-e TARGET_HOST_USERNAME=$(cat username) \
@@ -147,13 +149,16 @@ jobs:
147149
-e OUTPUT_FOLDER=/data \
148150
-e DEBUG=true \
149151
-v $PWD:/data:z \
152+
-v $PWD/secrets.txt:/opt/pde2e-runner/secrets.txt:z \
150153
quay.io/odockal/pde2e-runner:v0.0.1-windows \
151-
pd-e2e/run.ps1 \
154+
pd-e2e/runner.ps1 \
152155
-targetFolder pd-e2e \
153156
-resultsFolder results \
154157
-fork ${{ env.FORK }} \
155158
-branch ${{ env.BRANCH }} \
156-
-npmTarget ${{ env.NPM_TARGET }}
159+
-npmTarget ${{ env.NPM_TARGET }} \
160+
-envVars "{{ github.event.inputs.env_vars }}" \
161+
-secretFile secrets.txt
157162
# check logs
158163
podman logs -f pde2e-runner-run
159164

0 commit comments

Comments
 (0)