Skip to content

Cypress - fix after pulp-ci-centos s6-overlay upgrade #2503

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 31, 2022
Merged

Cypress - fix after pulp-ci-centos s6-overlay upgrade #2503

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
268f105
Cypress - fix after pulp-ci-centos s6-overlay upgrade
himdel Aug 30, 2022
bcd027d
Prefer /var/run/s6-rc/ symlink over /var/run/s6-rc:s6-rc-init:RANDOM_…
himdel Aug 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/cypress.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
uses: actions/cache@v2
with:
path: pulp_galaxy_ng/image
key: ${{ runner.os }}-container-${{ env.GALAXY_NG_COMMIT }}-post2480
key: ${{ runner.os }}-container-${{ env.GALAXY_NG_COMMIT }}-post2503

- name: "Checkout ansible-hub-ui (${{ github.ref }})"
uses: actions/checkout@v2
Expand Down Expand Up @@ -157,7 +157,7 @@ jobs:
mv -v dist/ ../pulp_galaxy_ng/static/galaxy_ng

# apply changes, runs collectstatic and serves static assets
podman exec pulp bash -c "s6-svc -r /var/run/s6/services/pulpcore-api"
podman exec pulp bash -c "s6-svc -r /var/run/s6-rc/servicedirs/pulpcore-api"

- name: "Reset admin password"
run: |
Expand All @@ -182,7 +182,7 @@ jobs:
"username": "admin",
"password": "admin",
"settings": "../../pulp_galaxy_ng/settings/settings.py",
"restart": "podman exec pulp bash -c \"s6-svc -r /var/run/s6/services/pulpcore-api\"; sleep 10",
"restart": "podman exec pulp bash -c \"s6-svc -r /var/run/s6-rc/servicedirs/pulpcore-api\"; sleep 10",
"containers": "localhost:8002",
"galaxykit": "galaxykit --ignore-certs"
}' > cypress.env.json
Expand Down