From bdb106fb4ebfeadbeff4426fd2dc5cbcea7f8530 Mon Sep 17 00:00:00 2001 From: Sheldon Regular Date: Mon, 8 Jan 2024 15:03:18 -0500 Subject: [PATCH 1/2] updated EULA title and AuthToken for pipeline Signed-off-by: Sheldon Regular --- .github/workflows/main.yml | 2 ++ .../pageobjects/bc_wallet/termsandconditions.py | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4df08331..ffeb964a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -73,6 +73,7 @@ jobs: if: ${{ matrix.mobile-platform=='-p Android' && !contains(matrix.report-project,'candy-uvp-pcft-chat') }} uses: ./.github/workflows/run-aath-agents with: + NGROK_AUTHTOKEN: ${{ secrets.NGROK_AUTHTOKEN }} LEDGER_URL_CONFIG: "http://test.bcovrin.vonx.io" USE_NGROK: "-n" @@ -89,6 +90,7 @@ jobs: if: ${{ matrix.mobile-platform=='-p Android' && contains(matrix.report-project,'candy-uvp-pcft-chat') }} uses: ./.github/workflows/run-aath-agents with: + NGROK_AUTHTOKEN: ${{ secrets.NGROK_AUTHTOKEN }} TEST_AGENTS: "-b acapy-main" GENESIS_URL: "https://raw.githubusercontent.com/ICCS-ISAC/dtrust-reconu/main/CANdy/test/pool_transactions_genesis" AGENT_CONFIG_FILE: "/aries-backchannels/acapy/read_only_ledger_verifier_config.yaml" diff --git a/aries-mobile-tests/pageobjects/bc_wallet/termsandconditions.py b/aries-mobile-tests/pageobjects/bc_wallet/termsandconditions.py index b839d14c..761b1325 100644 --- a/aries-mobile-tests/pageobjects/bc_wallet/termsandconditions.py +++ b/aries-mobile-tests/pageobjects/bc_wallet/termsandconditions.py @@ -12,8 +12,8 @@ class TermsAndConditionsPage(BasePage): # Locators # TODO: We could create a locator module that has all the locators. Given a specific app we could load the locators for that app. # not sure this would be a use case that would be common. Leaving locators with the page objects for now. - on_this_page_text_locator = "End User License Agreement" - on_this_page_locator = (AppiumBy.NAME, "End User License Agreement") + on_this_page_text_locator = "Terms of Use" + on_this_page_locator = (AppiumBy.NAME, "Terms of Use") terms_and_conditions_accept_aid_locator = "I Agree" terms_and_conditions_accept_locator = (AppiumBy.ID, "com.ariesbifold:id/IAgree") continue_button_locator = (AppiumBy.ID, "com.ariesbifold:id/Continue") From 664de09a88dc2f17a2b1ffd61be68d5fd41b622c Mon Sep 17 00:00:00 2001 From: Sheldon Regular Date: Mon, 8 Jan 2024 15:28:22 -0500 Subject: [PATCH 2/2] add AuthToken to action in pipeline Signed-off-by: Sheldon Regular --- .github/workflows/run-aath-agents/action.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/run-aath-agents/action.yml b/.github/workflows/run-aath-agents/action.yml index 35001291..5d6aa3d8 100644 --- a/.github/workflows/run-aath-agents/action.yml +++ b/.github/workflows/run-aath-agents/action.yml @@ -24,6 +24,10 @@ inputs: description: "Customized agent args to use" required: true default: "/aries-backchannels/acapy/auto_issuer_config.yaml" + NGROK_AUTHTOKEN: + description: "AUTH Token for NGROK when -n is used" + required: false + default: "" USE_NGROK: description: "Use NGROK Tunnel" required: false @@ -41,9 +45,9 @@ runs: - name: run-aath-agents run: | if [[ -n "${{ inputs.GENESIS_URL }}" ]]; then - GENESIS_URL=${{ inputs.GENESIS_URL }} TAILS_SERVER_URL_CONFIG=${{ inputs.TAILS_SERVER_URL_CONFIG }} AGENT_CONFIG_FILE=${{ inputs.AGENT_CONFIG_FILE }} ./manage start ${{ inputs.TEST_AGENTS }} ${{ inputs.USE_NGROK }} + GENESIS_URL=${{ inputs.GENESIS_URL }} NGROK_AUTHTOKEN=${{ inputs.NGROK_AUTHTOKEN }} TAILS_SERVER_URL_CONFIG=${{ inputs.TAILS_SERVER_URL_CONFIG }} AGENT_CONFIG_FILE=${{ inputs.AGENT_CONFIG_FILE }} ./manage start ${{ inputs.TEST_AGENTS }} ${{ inputs.USE_NGROK }} elif [[ -n "${{ inputs.LEDGER_URL_CONFIG }}" ]]; then - LEDGER_URL_CONFIG=${{inputs.LEDGER_URL_CONFIG}} TAILS_SERVER_URL_CONFIG=${{inputs.TAILS_SERVER_URL_CONFIG}} AGENT_CONFIG_FILE=${{inputs.AGENT_CONFIG_FILE}} ./manage start ${{inputs.TEST_AGENTS}} ${{inputs.USE_NGROK}} + LEDGER_URL_CONFIG=${{inputs.LEDGER_URL_CONFIG}} NGROK_AUTHTOKEN=${{ inputs.NGROK_AUTHTOKEN }} TAILS_SERVER_URL_CONFIG=${{inputs.TAILS_SERVER_URL_CONFIG}} AGENT_CONFIG_FILE=${{inputs.AGENT_CONFIG_FILE}} ./manage start ${{inputs.TEST_AGENTS}} ${{inputs.USE_NGROK}} else echo "Neither LEDGER_URL_CONFIG nor GENESIS_URL provided." fi