@@ -85,37 +85,23 @@ jobs:
85
85
ref : ' ${{ env.SHORT_BRANCH }}'
86
86
path : ' galaxy_ng'
87
87
88
- - name : " Checkout oci_env (main)"
89
- uses : actions/checkout@v4
90
- with :
91
- repository : ' pulp/oci_env'
92
- path : ' oci_env'
93
-
94
- - name : " Configure oci_env"
95
- working-directory : ' oci_env'
96
- run : |
97
- pip install --editable ./client/
98
- # merge common, profile-specific and test matrix specific config
99
- cat ../ansible-hub-ui/.github/workflows/cypress/compose.env.common \
100
- ../ansible-hub-ui/.github/workflows/cypress/compose.env."$BACKEND_FLAVOR" \
101
- ../ansible-hub-ui/test/cypress/e2e/"${{ matrix.test }}"/compose.env \
102
- | sed 's/^\s\+//' | tee compose.env || [ -s compose.env ]
103
-
104
- # oci-env compose build: FileNotFoundError: [Errno 2] No such file or directory: 'docker-compose'
88
+ # docker compose build: FileNotFoundError: [Errno 2] No such file or directory: 'docker-compose'
105
89
- name : " Provide docker-compose"
106
90
run : |
107
91
mkdir -p /home/runner/.local/bin/
108
92
cd /home/runner/.local/bin/
109
93
( echo '#!/bin/sh' ; echo 'docker compose "$@"' ) > docker-compose
110
94
chmod +x docker-compose
111
95
112
- - name : " oci-env compose build"
113
- working-directory : ' oci_env'
114
- run : ' oci-env compose build'
96
+ - name : " galaxy compose build"
97
+ run : |
98
+ cd galaxy_ng
99
+ DEV_SOURCE_PATH=galaxy_ng docker compose -f dev/compose/${{ env.BACKEND_FLAVOR }}.yaml build
115
100
116
- - name : " oci-env compose up"
117
- working-directory : ' oci_env'
118
- run : ' oci-env compose up &'
101
+ - name : " galaxy compose up"
102
+ run : |
103
+ cd galaxy_ng
104
+ DEV_SOURCE_PATH=galaxy_ng docker compose -f dev/compose/${{ env.BACKEND_FLAVOR }}.yaml up &
119
105
120
106
- name : " Install node 20"
121
107
uses : actions/setup-node@v4
@@ -311,8 +297,20 @@ jobs:
311
297
312
298
- name : " Kill container, show debug info"
313
299
if : always()
314
- working-directory : ' oci_env'
315
300
run : |
316
- oci-env exec bash -c "pip3 list && pip3 install pipdeptree && pipdeptree"
317
- oci-env compose logs
318
- oci-env compose kill
301
+ docker ps -a
302
+ echo ::group::MANAGER_LOGS
303
+ docker logs compose-manager-1
304
+ echo ::endgroup::
305
+ echo ::group::WORKER_LOGS
306
+ docker logs compose-worker-1
307
+ echo ::endgroup::
308
+ echo ::group::CONTENT_LOGS
309
+ docker logs compose-content-1
310
+ echo ::endgroup::
311
+ echo ::group::API_LOGS
312
+ docker logs compose-api-1
313
+ echo ::endgroup::
314
+ echo ::group::DEPENDENCIES
315
+ docker exec compose-manager-1 bash -c "pip list && pip install pipdeptree && pipdeptree"
316
+ echo ::endgroup::
0 commit comments