From 505c2edad5c18c25f17c3634926a733729543013 Mon Sep 17 00:00:00 2001 From: Fabricio Aguiar Date: Mon, 10 Mar 2025 12:02:46 +0000 Subject: [PATCH] Update galaxy_ng dev env ref: https://github.com/ansible/galaxy_ng/pull/2445 Issue: AAP-32608 Signed-off-by: Fabricio Aguiar rh-pre-commit.version: 2.3.2 rh-pre-commit.check-secrets: ENABLED --- .github/workflows/cypress.yml | 52 +++++++++---------- .github/workflows/cypress/compose.env.common | 9 ---- .../workflows/cypress/compose.env.community | 1 - .../workflows/cypress/compose.env.standalone | 1 - README.md | 17 +++--- config/insights.dev.webpack.config.js | 4 +- config/standalone.dev.webpack.config.js | 4 +- test/cypress.env.json.template | 2 +- 8 files changed, 37 insertions(+), 53 deletions(-) delete mode 100644 .github/workflows/cypress/compose.env.common delete mode 100644 .github/workflows/cypress/compose.env.community delete mode 100644 .github/workflows/cypress/compose.env.standalone diff --git a/.github/workflows/cypress.yml b/.github/workflows/cypress.yml index 2640c567df..979dee601a 100644 --- a/.github/workflows/cypress.yml +++ b/.github/workflows/cypress.yml @@ -85,23 +85,7 @@ jobs: ref: '${{ env.SHORT_BRANCH }}' path: 'galaxy_ng' - - name: "Checkout oci_env (main)" - uses: actions/checkout@v4 - with: - repository: 'pulp/oci_env' - path: 'oci_env' - - - name: "Configure oci_env" - working-directory: 'oci_env' - run: | - pip install --editable ./client/ - # merge common, profile-specific and test matrix specific config - cat ../ansible-hub-ui/.github/workflows/cypress/compose.env.common \ - ../ansible-hub-ui/.github/workflows/cypress/compose.env."$BACKEND_FLAVOR" \ - ../ansible-hub-ui/test/cypress/e2e/"${{ matrix.test }}"/compose.env \ - | sed 's/^\s\+//' | tee compose.env || [ -s compose.env ] - - # oci-env compose build: FileNotFoundError: [Errno 2] No such file or directory: 'docker-compose' + # docker compose build: FileNotFoundError: [Errno 2] No such file or directory: 'docker-compose' - name: "Provide docker-compose" run: | mkdir -p /home/runner/.local/bin/ @@ -109,13 +93,15 @@ jobs: ( echo '#!/bin/sh' ; echo 'docker compose "$@"' ) > docker-compose chmod +x docker-compose - - name: "oci-env compose build" - working-directory: 'oci_env' - run: 'oci-env compose build' + - name: "galaxy compose build" + run: | + cd galaxy_ng + DEV_SOURCE_PATH=galaxy_ng docker compose -f dev/compose/${{ env.BACKEND_FLAVOR }}.yaml build - - name: "oci-env compose up" - working-directory: 'oci_env' - run: 'oci-env compose up &' + - name: "galaxy compose up" + run: | + cd galaxy_ng + DEV_SOURCE_PATH=galaxy_ng docker compose -f dev/compose/${{ env.BACKEND_FLAVOR }}.yaml up & - name: "Install node 20" uses: actions/setup-node@v4 @@ -311,8 +297,20 @@ jobs: - name: "Kill container, show debug info" if: always() - working-directory: 'oci_env' run: | - oci-env exec bash -c "pip3 list && pip3 install pipdeptree && pipdeptree" - oci-env compose logs - oci-env compose kill + docker ps -a + echo ::group::MANAGER_LOGS + docker logs compose-manager-1 + echo ::endgroup:: + echo ::group::WORKER_LOGS + docker logs compose-worker-1 + echo ::endgroup:: + echo ::group::CONTENT_LOGS + docker logs compose-content-1 + echo ::endgroup:: + echo ::group::API_LOGS + docker logs compose-api-1 + echo ::endgroup:: + echo ::group::DEPENDENCIES + docker exec compose-manager-1 bash -c "pip list && pip install pipdeptree && pipdeptree" + echo ::endgroup:: diff --git a/.github/workflows/cypress/compose.env.common b/.github/workflows/cypress/compose.env.common deleted file mode 100644 index aa252eded1..0000000000 --- a/.github/workflows/cypress/compose.env.common +++ /dev/null @@ -1,9 +0,0 @@ -API_PORT=5001 -COMPOSE_BINARY=docker -DEV_SOURCE_PATH=galaxy_ng -DJANGO_SUPERUSER_PASSWORD=admin -DJANGO_SUPERUSER_USERNAME=admin -ENABLE_SIGNING=1 -PULP_CSRF_TRUSTED_ORIGINS='["http://localhost:8002"]' -SETUP_TEST_DATA=0 -UPDATE_UI=0 diff --git a/.github/workflows/cypress/compose.env.community b/.github/workflows/cypress/compose.env.community deleted file mode 100644 index c22bf91b55..0000000000 --- a/.github/workflows/cypress/compose.env.community +++ /dev/null @@ -1 +0,0 @@ -COMPOSE_PROFILE=galaxy_ng/base:galaxy_ng/community diff --git a/.github/workflows/cypress/compose.env.standalone b/.github/workflows/cypress/compose.env.standalone deleted file mode 100644 index 8be299d612..0000000000 --- a/.github/workflows/cypress/compose.env.standalone +++ /dev/null @@ -1 +0,0 @@ -COMPOSE_PROFILE=galaxy_ng/base diff --git a/README.md b/README.md index f03d8a6524..9576e6bf8a 100644 --- a/README.md +++ b/README.md @@ -11,27 +11,24 @@ The project is built on React & Patternfly, using components from [patternfly-re ### Backend -The development version of the backend runs in a container, using the [pulp/oci\_env](https://github.com/pulp/oci_env) wrapper. +The development version of the backend runs in a docker-compose. Set up: ``` -git clone https://github.com/pulp/oci_env git clone https://github.com/ansible/galaxy_ng -pip install -e oci_env/client/ -oci-env # make sure oci-env is in PATH ``` Run: ``` cd galaxy_ng -make oci/dab +make compose/aap ``` -The backend can be run in multiple modes - `standalone`, `community`, `insights`, `keycloak`, `ldap` and `dab`. -Depending on the mode, it will listen on http://localhost:5001 or http://localhost:55001, under `/api/galaxy/`, `/api/` or `/api/automation-hub/`. +The backend can be run in multiple modes - `standalone`, `community`, `insights`, `certified-sync` and `aap`. +Depending on the mode, it will listen on http://localhost:5001, under `/api/galaxy/`, `/api/` or `/api/automation-hub/`. Or, use the [simplified compose stack](https://github.com/ansible/galaxy_ng/tree/master/dev/compose#galaxy-simplified-compose-stack). @@ -64,9 +61,9 @@ This app can be developed in standalone, community, or insights mode. Insights m #### Modes -* `start-standalone`: assumes `oci/standalone` or `oci/dab`, http://localhost:8002/ui/ and http://localhost:55001/api/galaxy/ -* `start-community`: assumes `oci/community`, http://localhost:8002/ui/ and http://localhost:5001/api/ -* `start-insights`: assumes `oci/insights`, http://localhost:8002/preview/ansible/automation-hub/ and http://localhost:55001/api/automation-hub/ +* `start-standalone`: assumes `compose/standalone` or `compose/dab`, http://localhost:8002/ui/ and http://localhost:5001/api/galaxy/ +* `start-community`: assumes `compose/community`, http://localhost:8002/ui/ and http://localhost:5001/api/ +* `start-insights`: assumes `compose/insights`, http://localhost:8002/preview/ansible/automation-hub/ and http://localhost:5001/api/automation-hub/ * **NOTE:** This option is only relevant to Red Hat employees. diff --git a/config/insights.dev.webpack.config.js b/config/insights.dev.webpack.config.js index aa5eddd048..7356252d0c 100644 --- a/config/insights.dev.webpack.config.js +++ b/config/insights.dev.webpack.config.js @@ -1,12 +1,12 @@ const { webpackBase } = require('./webpack.base.config'); // Used for getting the correct host when running in a container -const proxyTarget = process.env.API_PROXY || 'http://localhost:55001'; +const proxyTarget = process.env.API_PROXY || 'http://localhost:5001'; const cloudBeta = process.env.HUB_CLOUD_BETA; // "true" | "false" | undefined (=default) module.exports = webpackBase({ - // The host where the API lives. EX: https://localhost:55001 + // The host where the API lives. EX: https://localhost:5001 API_HOST: '', // Path to the API on the API host. EX: /api/automation-hub diff --git a/config/standalone.dev.webpack.config.js b/config/standalone.dev.webpack.config.js index ee578f7853..2c27c0547d 100644 --- a/config/standalone.dev.webpack.config.js +++ b/config/standalone.dev.webpack.config.js @@ -4,13 +4,13 @@ const collectionRatings = require('../static/scores/collection.json'); const roleRatings = require('../static/scores/role.json'); // Used for getting the correct host when running in a container -const proxyTarget = process.env.API_PROXY || 'http://localhost:55001'; +const proxyTarget = process.env.API_PROXY || 'http://localhost:5001'; const apiBasePath = process.env.API_BASE_PATH || '/api/galaxy/'; const uiExternalLoginURI = process.env.UI_EXTERNAL_LOGIN_URI || '/login'; module.exports = webpackBase({ - // The host where the API lives. EX: https://localhost:55001 + // The host where the API lives. EX: https://localhost:5001 API_HOST: '', // Path to the API on the API host. EX: /api/automation-hub diff --git a/test/cypress.env.json.template b/test/cypress.env.json.template index 6554c8a105..b553c19f6b 100644 --- a/test/cypress.env.json.template +++ b/test/cypress.env.json.template @@ -4,7 +4,7 @@ "uiPrefix": "/ui/", "username": "admin", "password": "admin", - "containers": "localhost:55001", + "containers": "localhost:5001", "galaxykit": "galaxykit --ignore-certs" }