Skip to content

Commit 39f8a50

Browse files
committed
Update galaxy_ng dev env
ref: ansible/galaxy_ng#2445 Issue: AAP-32608 Signed-off-by: Fabricio Aguiar <fabricio.aguiar@gmail.com> rh-pre-commit.version: 2.3.2 rh-pre-commit.check-secrets: ENABLED
1 parent 3de18f5 commit 39f8a50

File tree

5 files changed

+29
-45
lines changed

5 files changed

+29
-45
lines changed

.github/workflows/cypress.yml

+25-27
Original file line numberDiff line numberDiff line change
@@ -85,37 +85,23 @@ jobs:
8585
ref: '${{ env.SHORT_BRANCH }}'
8686
path: 'galaxy_ng'
8787

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'
10589
- name: "Provide docker-compose"
10690
run: |
10791
mkdir -p /home/runner/.local/bin/
10892
cd /home/runner/.local/bin/
10993
( echo '#!/bin/sh' ; echo 'docker compose "$@"' ) > docker-compose
11094
chmod +x docker-compose
11195
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
115100
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 &
119105
120106
- name: "Install node 20"
121107
uses: actions/setup-node@v4
@@ -311,8 +297,20 @@ jobs:
311297
312298
- name: "Kill container, show debug info"
313299
if: always()
314-
working-directory: 'oci_env'
315300
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::

.github/workflows/cypress/compose.env.common

-9
This file was deleted.

.github/workflows/cypress/compose.env.community

-1
This file was deleted.

.github/workflows/cypress/compose.env.standalone

-1
This file was deleted.

README.md

+4-7
Original file line numberDiff line numberDiff line change
@@ -11,27 +11,24 @@ The project is built on React & Patternfly, using components from [patternfly-re
1111

1212
### Backend
1313

14-
The development version of the backend runs in a container, using the [pulp/oci\_env](https://github.com/pulp/oci_env) wrapper.
14+
The development version of the backend runs in a docker-compose.
1515

1616
Set up:
1717

1818
```
19-
git clone https://github.com/pulp/oci_env
2019
git clone https://github.com/ansible/galaxy_ng
2120
22-
pip install -e oci_env/client/
23-
oci-env # make sure oci-env is in PATH
2421
```
2522

2623
Run:
2724

2825
```
2926
cd galaxy_ng
30-
make oci/dab
27+
make compose/aap
3128
```
3229

33-
The backend can be run in multiple modes - `standalone`, `community`, `insights`, `keycloak`, `ldap` and `dab`.
34-
Depending on the mode, it will listen on http://localhost:5001 or http://localhost:55001, under `/api/galaxy/`, `/api/` or `/api/automation-hub/`.
30+
The backend can be run in multiple modes - `standalone`, `community`, `insights`, `certified-sync` and `aap`.
31+
Depending on the mode, it will listen on http://localhost:5001, under `/api/galaxy/`, `/api/` or `/api/automation-hub/`.
3532

3633
Or, use the [simplified compose stack](https://github.com/ansible/galaxy_ng/tree/master/dev/compose#galaxy-simplified-compose-stack).
3734

0 commit comments

Comments
 (0)