Skip to content

Commit 22cc420

Browse files
adrianrioboadrianriobo
committed
test syntax
1 parent 0ba704b commit 22cc420

File tree

3 files changed

+96
-58
lines changed

3 files changed

+96
-58
lines changed

‎.github/workflows/all.yml‎

Lines changed: 78 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ on:
88

99
env:
1010
OCI_E2E_NAME: libhvee-e2e
11+
CORRELATE: ${{ github.sha }}
1112

1213
jobs:
1314
build-oci-e2e:
@@ -22,13 +23,13 @@ jobs:
2223
- name: Build and archive e2e image
2324
# use github.sha as ID to correlate various workflows triggered by the same event
2425
run: |
25-
VERSION=${{ github.sha }} make build-oci-e2e
26-
podman save -o ${{ env.OCI_E2E_NAME }}.tar quay.io/rhqp/${{ env.OCI_E2E_NAME}}:v${{ github.sha }}
26+
VERSION=${{ env.CORRELATE }} make build-oci-e2e
27+
podman save -o ${{ env.OCI_E2E_NAME }}.tar quay.io/rhqp/${{ env.OCI_E2E_NAME}}:v${{ env.CORRELATE }}
2728
2829
- name: Upload e2e flat image as artifact
2930
uses: actions/upload-artifact@v3
3031
with:
31-
name: ${{ env.OCI_E2E_NAME }}-v${{ github.sha }}
32+
name: ${{ env.OCI_E2E_NAME }}-v${{ env.CORRELATE }}
3233
path: ${{ env.OCI_E2E_NAME }}.tar
3334

3435
build-executables:
@@ -51,7 +52,7 @@ jobs:
5152
- name: Upload libhvee executables as artifact
5253
uses: actions/upload-artifact@v3
5354
with:
54-
name: libhvee-v${{ github.sha }}
55+
name: libhvee-v${{ env.CORRELATE }}
5556
path: bin/*.exe
5657

5758
e2e-windows-destkop:
@@ -75,55 +76,79 @@ jobs:
7576
steps:
7677
# When moving to be executed on upstream we need to save the context
7778
# to try match the ${{ github.sha }} or some other correlation value
78-
- name: Create instance
79-
run: |
80-
# Create instance
81-
podman run -d --name windows-create --rm \
82-
-v ${PWD}:/workspace:z \
83-
-e ARM_TENANT_ID=${{ secrets.ARM_TENANT_ID }} \
84-
-e ARM_SUBSCRIPTION_ID=${{ secrets.ARM_SUBSCRIPTION_ID }} \
85-
-e ARM_CLIENT_ID=${{ secrets.ARM_CLIENT_ID }} \
86-
-e ARM_CLIENT_SECRET='${{ secrets.ARM_CLIENT_SECRET }}' \
87-
-e AZURE_STORAGE_ACCOUNT='${{ secrets.AZURE_STORAGE_ACCOUNT }}' \
88-
-e AZURE_STORAGE_KEY='${{ secrets.AZURE_STORAGE_KEY }}' \
89-
quay.io/rhqp/qenvs:v0.6.1 azure \
90-
windows create \
91-
--project-name 'windows-desktop' \
92-
--backed-url azblob://qenvs-state/${{ github.sha }} \
93-
--conn-details-output '/workspace' \
94-
--windows-version '${{ matrix.windows-version }}' \
95-
--windows-featurepack '${{ matrix.windows-featurepack }}' \
96-
--tags org=containers,project=libhvee,origin=ghaction \
97-
--spot
98-
# Check logs
99-
podman logs -f windows-create
100-
101-
- name: Check instance system info
102-
run: |
103-
ssh -i id_rsa \
104-
-o StrictHostKeyChecking=no \
105-
-o UserKnownHostsFile=/dev/null \
106-
-o ServerAliveInterval=30 \
107-
-o ServerAliveCountMax=1200 \
108-
$(cat username)@$(cat host) "systeminfo"
109-
110-
- name: Destroy instance
111-
if: always()
79+
# - name: Create instance
80+
# run: |
81+
# # Create instance
82+
# podman run -d --name windows-create --rm \
83+
# -v ${PWD}:/workspace:z \
84+
# -e ARM_TENANT_ID=${{ secrets.ARM_TENANT_ID }} \
85+
# -e ARM_SUBSCRIPTION_ID=${{ secrets.ARM_SUBSCRIPTION_ID }} \
86+
# -e ARM_CLIENT_ID=${{ secrets.ARM_CLIENT_ID }} \
87+
# -e ARM_CLIENT_SECRET='${{ secrets.ARM_CLIENT_SECRET }}' \
88+
# -e AZURE_STORAGE_ACCOUNT='${{ secrets.AZURE_STORAGE_ACCOUNT }}' \
89+
# -e AZURE_STORAGE_KEY='${{ secrets.AZURE_STORAGE_KEY }}' \
90+
# quay.io/rhqp/qenvs:v0.6.1 azure \
91+
# windows create \
92+
# --project-name 'windows-desktop' \
93+
# --backed-url azblob://qenvs-state/${{ github.sha }} \
94+
# --conn-details-output '/workspace' \
95+
# --windows-version '${{ matrix.windows-version }}' \
96+
# --windows-featurepack '${{ matrix.windows-featurepack }}' \
97+
# --tags org=containers,project=libhvee,origin=ghaction \
98+
# --spot
99+
# # Check logs
100+
# podman logs -f windows-create
101+
102+
# - name: Check instance system info
103+
# run: |
104+
# ssh -i id_rsa \
105+
# -o StrictHostKeyChecking=no \
106+
# -o UserKnownHostsFile=/dev/null \
107+
# -o ServerAliveInterval=30 \
108+
# -o ServerAliveCountMax=1200 \
109+
# $(cat username)@$(cat host) "systeminfo"
110+
111+
- name: Download e2e flat image as artifact
112+
id: download-libhvee-e2e
113+
uses: dawidd6/action-download-artifact@v3
114+
with:
115+
name: libhvee-e2e-v${{ env.CORRELATE }}
116+
# workflow: all.yml
117+
# workflow_conclusion: ""
118+
119+
- name: Download libhvee executables
120+
id: download-libhvee
121+
uses: dawidd6/action-download-artifact@v3
122+
with:
123+
path: .
124+
name: libhvee-v${{ env.CORRELATE }}
125+
# workflow: all.yml
126+
# workflow_conclusion: ""
127+
128+
- name: Run libhvee e2e
112129
run: |
113-
# Destroy instance
114-
podman run -d --name windows-destroy --rm \
115-
-v ${PWD}:/workspace:z \
116-
-e ARM_TENANT_ID=${{ secrets.ARM_TENANT_ID }} \
117-
-e ARM_SUBSCRIPTION_ID=${{ secrets.ARM_SUBSCRIPTION_ID }} \
118-
-e ARM_CLIENT_ID=${{ secrets.ARM_CLIENT_ID }} \
119-
-e ARM_CLIENT_SECRET='${{ secrets.ARM_CLIENT_SECRET }}' \
120-
-e AZURE_STORAGE_ACCOUNT='${{ secrets.AZURE_STORAGE_ACCOUNT }}' \
121-
-e AZURE_STORAGE_KEY='${{ secrets.AZURE_STORAGE_KEY }}' \
122-
quay.io/rhqp/qenvs:v0.6.1 azure \
123-
windows destroy \
124-
--project-name 'windows-desktop' \
125-
--backed-url azblob://qenvs-state/${{ github.sha }}
126-
# Check logs
127-
podman logs -f windows-destroy
130+
# load libhvee-e2e image from tar file
131+
# podman load -i libhvee-e2e.tar
132+
ls
133+
# podman images
134+
135+
# - name: Destroy instance
136+
# if: always()
137+
# run: |
138+
# # Destroy instance
139+
# podman run -d --name windows-destroy --rm \
140+
# -v ${PWD}:/workspace:z \
141+
# -e ARM_TENANT_ID=${{ secrets.ARM_TENANT_ID }} \
142+
# -e ARM_SUBSCRIPTION_ID=${{ secrets.ARM_SUBSCRIPTION_ID }} \
143+
# -e ARM_CLIENT_ID=${{ secrets.ARM_CLIENT_ID }} \
144+
# -e ARM_CLIENT_SECRET='${{ secrets.ARM_CLIENT_SECRET }}' \
145+
# -e AZURE_STORAGE_ACCOUNT='${{ secrets.AZURE_STORAGE_ACCOUNT }}' \
146+
# -e AZURE_STORAGE_KEY='${{ secrets.AZURE_STORAGE_KEY }}' \
147+
# quay.io/rhqp/qenvs:v0.6.1 azure \
148+
# windows destroy \
149+
# --project-name 'windows-desktop' \
150+
# --backed-url azblob://qenvs-state/${{ github.sha }}
151+
# # Check logs
152+
# podman logs -f windows-destroy
128153

129154

‎.github/workflows/builder.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
name: builder
22

3-
on:
4-
push:
5-
branches:
6-
- "main"
7-
pull_request: {}
3+
# on:
4+
# push:
5+
# branches:
6+
# - "main"
7+
# pull_request: {}
88

99
env:
1010
OCI_E2E_NAME: libhvee-e2e

‎.github/workflows/tester.yml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,19 @@ jobs:
6262
-o ServerAliveCountMax=1200 \
6363
$(cat username)@$(cat host) "systeminfo"
6464
65+
- name: Download e2e flat image as artifact
66+
id: download-images-artifact
67+
uses: dawidd6/action-download-artifact@v3
68+
with:
69+
# workflow_conclusion: completed
70+
# workflow: build-tests.yml
71+
name: libhvee-e2e-v${{ github.sha }}
72+
73+
- name: Run libhvee e2e
74+
run: |
75+
# load libhvee-e2e image from tar file
76+
podman load -i libhvee-e2e.tar
77+
6578
- name: Destroy instance
6679
if: always()
6780
run: |

0 commit comments

Comments
 (0)