Skip to content

Commit 6d3ad77

Browse files
committed
move OOD checks to current branch section + reduce hpctests in release image test
1 parent 5bc03dc commit 6d3ad77

File tree

2 files changed

+33
-33
lines changed

2 files changed

+33
-33
lines changed

.github/workflows/stackhpc.yml

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -142,45 +142,14 @@ jobs:
142142
run: |
143143
. venv/bin/activate
144144
. environments/.stackhpc/activate
145-
ansible-playbook -vv ansible/adhoc/hpctests.yml
145+
ansible-playbook -vv ansible/adhoc/hpctests.yml --tags pingpong
146146
147147
# - name: Run EESSI tests
148148
# run: |
149149
# . venv/bin/activate
150150
# . environments/.stackhpc/activate
151151
# ansible-playbook -vv ansible/ci/check_eessi.yml
152152

153-
- name: Confirm Open Ondemand is up (via SOCKS proxy)
154-
run: |
155-
. venv/bin/activate
156-
. environments/.stackhpc/activate
157-
158-
# load ansible variables into shell:
159-
ansible-playbook ansible/ci/output_vars.yml \
160-
-e output_vars_hosts=openondemand \
161-
-e output_vars_path=$APPLIANCES_ENVIRONMENT_ROOT/vars.txt \
162-
-e output_vars_items=bastion_ip,bastion_user,openondemand_servername
163-
source $APPLIANCES_ENVIRONMENT_ROOT/vars.txt
164-
165-
# setup ssh proxying:
166-
sudo apt-get --yes install proxychains
167-
echo proxychains installed
168-
ssh -v -fN -D 9050 ${bastion_user}@${bastion_ip}
169-
echo port 9050 forwarded
170-
171-
# check OOD server returns 200:
172-
statuscode=$(proxychains wget \
173-
--quiet \
174-
--spider \
175-
--server-response \
176-
--no-check-certificate \
177-
--http-user=demo_user \
178-
--http-password=${DEMO_USER_PASSWORD} https://${openondemand_servername} \
179-
2>&1)
180-
(echo $statuscode | grep "200 OK") || (echo $statuscode && exit 1)
181-
env:
182-
DEMO_USER_PASSWORD: ${{ secrets.TEST_USER_PASSWORD }}
183-
184153
- name: Checkout current branch
185154
run: git checkout ${{ github.head_ref || github.ref_name }}
186155

@@ -229,6 +198,37 @@ jobs:
229198
. environments/.stackhpc/activate
230199
ansible-playbook -vv ansible/adhoc/hpctests.yml
231200
201+
- name: Confirm Open Ondemand is up (via SOCKS proxy)
202+
run: |
203+
. venv/bin/activate
204+
. environments/.stackhpc/activate
205+
206+
# load ansible variables into shell:
207+
ansible-playbook ansible/ci/output_vars.yml \
208+
-e output_vars_hosts=openondemand \
209+
-e output_vars_path=$APPLIANCES_ENVIRONMENT_ROOT/vars.txt \
210+
-e output_vars_items=bastion_ip,bastion_user,openondemand_servername
211+
source $APPLIANCES_ENVIRONMENT_ROOT/vars.txt
212+
213+
# setup ssh proxying:
214+
sudo apt-get --yes install proxychains
215+
echo proxychains installed
216+
ssh -v -fN -D 9050 ${bastion_user}@${bastion_ip}
217+
echo port 9050 forwarded
218+
219+
# check OOD server returns 200:
220+
statuscode=$(proxychains wget \
221+
--quiet \
222+
--spider \
223+
--server-response \
224+
--no-check-certificate \
225+
--http-user=demo_user \
226+
--http-password=${DEMO_USER_PASSWORD} https://${openondemand_servername} \
227+
2>&1)
228+
(echo $statuscode | grep "200 OK") || (echo $statuscode && exit 1)
229+
env:
230+
DEMO_USER_PASSWORD: ${{ secrets.TEST_USER_PASSWORD }}
231+
232232
- name: Delete infrastructure
233233
run: |
234234
. venv/bin/activate
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
---
22
pytools_editable: false
3-
pytools_gitref: master # TODO: FIXME: do a release!
3+
pytools_gitref: v2.0
44
pytools_user: root

0 commit comments

Comments
 (0)