GRM-161: Fix register.yml service start and bump devx to v0.50.5 (#238)
- Fix register.yml premature service start (removed systemctl start before unit file exists) - Replace broken inline Python in ci.yml auto-merge with devx.ci.wait_for_checks - Bump devx from v0.50.0 to v0.50.5 GRM-161
This commit is contained in:
+6
-26
@@ -311,34 +311,14 @@ jobs:
|
||||
if: needs.validate.outputs.ansible-changed == 'true'
|
||||
env:
|
||||
CI_GITEA_API_TOKEN: ${{ secrets.CI_GITEA_API_TOKEN }}
|
||||
REPOSITORY: ${{ github.repository }}
|
||||
PR_NUMBER: ${{ github.event.number }}
|
||||
run: |
|
||||
. .venv/bin/activate 2>/dev/null || true
|
||||
# Poll Gitea API for molecule-tests job status (max 20 min)
|
||||
for i in $(seq 1 120); do
|
||||
all_done=$(python3 -c "
|
||||
import json,urllib.request
|
||||
url='https://git.oblachno.oblachno.fyi/api/v1/repos/$REPOSITORY/actions/runs?limit=5&event=pull_request'
|
||||
req=urllib.request.Request(url,headers={'Authorization':'token $CI_GITEA_API_TOKEN'})
|
||||
runs=json.loads(urllib.request.urlopen(req).read())
|
||||
for r in runs[:3]:
|
||||
jobs_url=f'https://git.oblachno.oblachno.fyi/api/v1/repos/$REPOSITORY/actions/runs/{r[\"id\"]}/jobs'
|
||||
jreq=urllib.request.Request(jobs_url,headers={'Authorization':'token $CI_GITEA_API_TOKEN'})
|
||||
jobs=json.loads(urllib.request.urlopen(jreq).read())
|
||||
for j in (jobs if isinstance(jobs,list) else jobs.get('jobs',[])):
|
||||
if j.get('name','').startswith('molecule-tests') and j.get('status')!='completed':
|
||||
print('WAITING'); break
|
||||
else:
|
||||
continue
|
||||
break
|
||||
else:
|
||||
print('DONE')
|
||||
")
|
||||
echo "Poll $i: $all_done"
|
||||
[ "$all_done" = "DONE" ] && break
|
||||
sleep 10
|
||||
done
|
||||
python3 -m devx.ci.wait_for_checks \
|
||||
--job-name "molecule-tests" \
|
||||
--repo "${{ github.repository }}" \
|
||||
--timeout 1200 \
|
||||
--poll-interval 10 \
|
||||
--no-require-success
|
||||
- name: Squash merge with task ID
|
||||
env:
|
||||
CI_GITEA_API_TOKEN: ${{ secrets.CI_GITEA_API_TOKEN }}
|
||||
|
||||
Reference in New Issue
Block a user