From 3e065668610f7b1181d4f49c6a1f8762538144a5 Mon Sep 17 00:00:00 2001 From: Manikanth Guntupally Venkata Date: Thu, 13 Mar 2025 15:02:01 +0000 Subject: [PATCH 1/3] Pass profile to docker-compose --- .github/actions/hps_services/action.yml | 8 +++++++- .github/workflows/tests.yml | 5 +++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.github/actions/hps_services/action.yml b/.github/actions/hps_services/action.yml index 788dc6d68..5b67a2802 100644 --- a/.github/actions/hps_services/action.yml +++ b/.github/actions/hps_services/action.yml @@ -24,6 +24,10 @@ inputs: description: 'Token to access the ansys-internal github docker registry' required: true + profile: + description: 'Docker compose profiles to use' + required: false + outputs: url: description: 'HPS URL' @@ -85,6 +89,8 @@ runs: - name: Start services (internal package) if: ${{ inputs.version == 'latest-dev' }} + env: + PROFILE: ${{ inputs.profile }} shell: bash run: | echo "$(pwd)" @@ -93,7 +99,7 @@ runs: tar -xvzf docker-compose-internal.tar.gz cd docker-compose docker-compose pull - docker-compose up -d + docker-compose --profile $PROFILE up -d working-directory: ./docker-compose-artifact - name: Wait for services diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 9dc4c9b78..6a9e0dc44 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -23,6 +23,10 @@ on: description: HPS Feature to test against (only for latest-dev version) type: string default: 'main' + docker-compose-profiles: + description: Docker compose profiles to use + type: string + default: 'stable,data-transfer-minio' jobs: @@ -56,6 +60,7 @@ jobs: ghcr-token: ${{ secrets.PYANSYS_CI_BOT_PACKAGE_TOKEN }} version: ${{ inputs.hps-version }} feature: ${{ inputs.hps-feature }} + profile: ${{ inputs.docker-compose-profiles }} - name: Test with tox run: tox -e ${{ inputs.toxenv }}-coverage From bec9d9c25a7004ab8f53c056320eccfcf7e74359 Mon Sep 17 00:00:00 2001 From: Manikanth Guntupally Venkata Date: Thu, 13 Mar 2025 15:38:41 +0000 Subject: [PATCH 2/3] change branch --- .github/actions/hps_services/action.yml | 6 +++++- .github/workflows/tests.yml | 3 +-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/actions/hps_services/action.yml b/.github/actions/hps_services/action.yml index 5b67a2802..f00cc761e 100644 --- a/.github/actions/hps_services/action.yml +++ b/.github/actions/hps_services/action.yml @@ -99,7 +99,11 @@ runs: tar -xvzf docker-compose-internal.tar.gz cd docker-compose docker-compose pull - docker-compose --profile $PROFILE up -d + if [ -z "$PROFILE"]; then + docker-compose up -d + else + docker-compose --profile $PROFILE up -d + fi working-directory: ./docker-compose-artifact - name: Wait for services diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 6a9e0dc44..4e92a9dd1 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -26,7 +26,6 @@ on: docker-compose-profiles: description: Docker compose profiles to use type: string - default: 'stable,data-transfer-minio' jobs: @@ -53,7 +52,7 @@ jobs: - name: Start HPS services id: hps-services - uses: ansys/pyhps/.github/actions/hps_services@main + uses: ansys/pyhps/.github/actions/hps_services@mguntupa/workflow with: token: ${{ secrets.PYANSYS_CI_BOT_TOKEN }} ghcr-username: ${{ secrets.PYANSYS_CI_BOT_USERNAME }} From 2c9cf6fadd1066e83cb4ed0705ca34b10d2733b0 Mon Sep 17 00:00:00 2001 From: Manikanth Guntupally Venkata Date: Fri, 14 Mar 2025 15:51:51 +0000 Subject: [PATCH 3/3] change branch --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 4e92a9dd1..510240173 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -52,7 +52,7 @@ jobs: - name: Start HPS services id: hps-services - uses: ansys/pyhps/.github/actions/hps_services@mguntupa/workflow + uses: ansys/pyhps/.github/actions/hps_services@main with: token: ${{ secrets.PYANSYS_CI_BOT_TOKEN }} ghcr-username: ${{ secrets.PYANSYS_CI_BOT_USERNAME }}