Update gh actions with changes to support fixes to CI workflows (#417)

ansible · Jul 5, 2024 · 96775c1 · 96775c1
1 parent e4a4d78
commit 96775c1
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/.github/workflows/ci_dab_jwt_versioned.yml b/.github/workflows/ci_dab_jwt_versioned.yml
@@ -58,6 +58,11 @@ jobs:
           echo "OCI_VERBOSE=1" >> $GITHUB_ENV
           echo "GH_DUMP_LOGS=1" >> $GITHUB_ENV
           echo "GH_TEARDOWN=0" >> $GITHUB_ENV
+          echo "AH_HOST=http://localhost:8080/" >> $GITHUB_ENV
+          echo "AH_USERNAME=admin" >> $GITHUB_ENV
+          echo "AH_PASSWORD=admin" >> $GITHUB_ENV
+          echo "AH_LOGIN_PATH=/api/gateway/v1/login/" >> $GITHUB_ENV
+          echo "AH_LOGOUT_PATH=/api/gateway/v1/logout/" >> $GITHUB_ENV
 
       - name: Update apt
         run: sudo apt -y update
@@ -80,7 +85,7 @@ jobs:
         run: python3 dev/oci_env_integration/actions/ci_dab_jwt.py
 
       - name: "Perform playbook collection tests"
-        run: ansible-playbook tests/playbooks/testing_collections_playbook.yml -v -e galaxy_ng_version=${{ inputs.galaxy_ng_version }} -e git_repo_name=${{ github.event.repository.name }}
+        run: ansible-playbook tests/playbooks/testing_collections_playbook.yml -v -e galaxy_ng_version=${{ inputs.galaxy_ng_version }} -e git_repo_name=${{ github.event.repository.name }} -e ci_workflow=ci_dab_jwt
 
       - name: "Perform collection repository tests"
         run: ansible-playbook tests/playbooks/testing_collections_repos.yml -v -e galaxy_ng_version=${{ inputs.galaxy_ng_version }}

diff --git a/.github/workflows/ci_standalone_versioned.yml b/.github/workflows/ci_standalone_versioned.yml
@@ -58,6 +58,9 @@ jobs:
           echo "OCI_VERBOSE=1" >> $GITHUB_ENV
           echo "GH_DUMP_LOGS=1" >> $GITHUB_ENV
           echo "GH_TEARDOWN=0" >> $GITHUB_ENV
+          echo "AH_HOST=http://localhost:55001/" >> $GITHUB_ENV
+          echo "AH_USERNAME=admin" >> $GITHUB_ENV
+          echo "AH_PASSWORD=admin" >> $GITHUB_ENV
 
       - name: Update apt
         run: sudo apt -y update
@@ -83,7 +86,7 @@ jobs:
         run: ansible-playbook tests/playbooks/testing_playbook_user.yml -v -e galaxy_ng_version=${{ inputs.galaxy_ng_version }}
 
       - name: "Perform playbook collection tests"
-        run: ansible-playbook tests/playbooks/testing_collections_playbook.yml -v -e galaxy_ng_version=${{ inputs.galaxy_ng_version }} -e git_repo_name=${{ github.event.repository.name }}
+        run: ansible-playbook tests/playbooks/testing_collections_playbook.yml -v -e galaxy_ng_version=${{ inputs.galaxy_ng_version }} -e git_repo_name=${{ github.event.repository.name }} -e ci_workflow=ci_standalone
 
       - name: "Perform collection repository tests"
         run: ansible-playbook tests/playbooks/testing_collections_repos.yml -v -e galaxy_ng_version=${{ inputs.galaxy_ng_version }}

diff --git a/changelogs/fragments/update-github-actions.yml b/changelogs/fragments/update-github-actions.yml
@@ -0,0 +1,5 @@
+---
+minor_changes:
+  - Added AH_HOST, AH_USERNAME and AH_PASSWORD to github environment variables
+  - Added extra variable ci_workflow to allow for more flexibility in testing playbooks.
+...