From 38ae87edd7f50c4cbe120540698cdce17ac3edc4 Mon Sep 17 00:00:00 2001
From: Ian Costanzo <ian@anon-solutions.ca>
Date: Tue, 7 Sep 2021 16:39:37 -0700
Subject: [PATCH 1/3] Run integration tests using external ledger and tails
 server

Signed-off-by: Ian Costanzo <ian@anon-solutions.ca>
---
 .github/workflows/integrationtests.yml   |  8 ++++----
 actions/run-integration-tests/action.yml | 10 +++++++++-
 demo/run_bdd                             |  2 ++
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/integrationtests.yml b/.github/workflows/integrationtests.yml
index b1d499a846..db62b14a34 100644
--- a/.github/workflows/integrationtests.yml
+++ b/.github/workflows/integrationtests.yml
@@ -16,10 +16,10 @@ jobs:
         uses: actions/checkout@v2
         with:
           path: acapy
-      - name: run-von-network
-        uses: ./acapy/actions/run-von-network
-      - name: run-indy-tails-server
-        uses: ./acapy/actions/run-indy-tails-server
+      #- name: run-von-network
+      #  uses: ./acapy/actions/run-von-network
+      #- name: run-indy-tails-server
+      #  uses: ./acapy/actions/run-indy-tails-server
       - name: run-integration-tests
         uses: ./acapy/actions/run-integration-tests
         # to run with a specific set of tests include the following parameter:
diff --git a/actions/run-integration-tests/action.yml b/actions/run-integration-tests/action.yml
index bcf49d8382..15912dda9a 100644
--- a/actions/run-integration-tests/action.yml
+++ b/actions/run-integration-tests/action.yml
@@ -6,13 +6,21 @@ inputs:
     description: "Set of flags that defines the test scope"
     required: false
     default: "-t @GHA"
+  LEDGER_URL:
+    description: "URL to the von network ledger browser"
+    required: false
+    default: "http://test.bcovrin.vonx.io"
+  PUBLIC_TAILS_URL:
+    description: "URL to the tails server"
+    required: false
+    default: "https://tails.vonx.io"
 runs:
   using: "composite"
   steps:
     - name: run-integration-tests-acapy
       # to run with external ledger and tails server run as follows (and remove the ledger and tails actions from the workflow):
       # run: LEDGER_URL=http://test.bcovrin.vonx.io PUBLIC_TAILS_URL=https://tails.vonx.io ./run_bdd ${{ inputs.TEST_SCOPE }}
-      run: ./run_bdd ${{ inputs.TEST_SCOPE }}
+      run: LEDGER_URL=${{ inputs.LEDGER_URL }} PUBLIC_TAILS_URL=${{ PUBLIC_TAILS_URL }} ./run_bdd ${{ inputs.TEST_SCOPE }}
       shell: bash
       env:
         NO_TTY: "1"
diff --git a/demo/run_bdd b/demo/run_bdd
index 8ce5297ea5..1b5390e8a0 100755
--- a/demo/run_bdd
+++ b/demo/run_bdd
@@ -175,6 +175,7 @@ fi
 if ! [ -z "$POSTGRES" ]; then
   DOCKER_ENV="${DOCKER_ENV} -e POSTGRES=1 -e RUST_BACKTRACE=1"
 fi
+# e.g. LEDGER_URL=http://test.bcovrin.vonx.io
 if ! [ -z "$LEDGER_URL" ]; then
   GENESIS_URL="${LEDGER_URL}/genesis"
   DOCKER_ENV="${DOCKER_ENV} -e LEDGER_URL=${LEDGER_URL}"
@@ -205,6 +206,7 @@ if ! [ -z "$TAILS_NETWORK" ]; then
   DOCKER_ENV="${DOCKER_ENV} -e TAILS_NETWORK=${TAILS_NETWORK}"
   DOCKER_ENV="${DOCKER_ENV} -e TAILS_NGROK_NAME=ngrok-tails-server"
 fi
+# e.g. PUBLIC_TAILS_URL=http://tails.vonx.io
 if ! [ -z "$PUBLIC_TAILS_URL" ]; then
   DOCKER_ENV="${DOCKER_ENV} -e PUBLIC_TAILS_URL=${PUBLIC_TAILS_URL}"
 fi

From a583b34c140627e3ed03a1459b9367ea53f696e5 Mon Sep 17 00:00:00 2001
From: Ian Costanzo <ian@anon-solutions.ca>
Date: Tue, 7 Sep 2021 16:40:52 -0700
Subject: [PATCH 2/3] Run integration tests using external ledger and tails
 server

Signed-off-by: Ian Costanzo <ian@anon-solutions.ca>
---
 demo/run_bdd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/demo/run_bdd b/demo/run_bdd
index 1b5390e8a0..d7d356661b 100755
--- a/demo/run_bdd
+++ b/demo/run_bdd
@@ -206,7 +206,7 @@ if ! [ -z "$TAILS_NETWORK" ]; then
   DOCKER_ENV="${DOCKER_ENV} -e TAILS_NETWORK=${TAILS_NETWORK}"
   DOCKER_ENV="${DOCKER_ENV} -e TAILS_NGROK_NAME=ngrok-tails-server"
 fi
-# e.g. PUBLIC_TAILS_URL=http://tails.vonx.io
+# e.g. PUBLIC_TAILS_URL=https://tails.vonx.io
 if ! [ -z "$PUBLIC_TAILS_URL" ]; then
   DOCKER_ENV="${DOCKER_ENV} -e PUBLIC_TAILS_URL=${PUBLIC_TAILS_URL}"
 fi

From d307b13fe8620e78f782ee77152c16e737407e18 Mon Sep 17 00:00:00 2001
From: Ian Costanzo <ian@anon-solutions.ca>
Date: Tue, 7 Sep 2021 16:55:30 -0700
Subject: [PATCH 3/3] Run integration tests using external ledger and tails
 server

Signed-off-by: Ian Costanzo <ian@anon-solutions.ca>
---
 actions/run-integration-tests/action.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/actions/run-integration-tests/action.yml b/actions/run-integration-tests/action.yml
index 15912dda9a..cd64509d02 100644
--- a/actions/run-integration-tests/action.yml
+++ b/actions/run-integration-tests/action.yml
@@ -6,11 +6,11 @@ inputs:
     description: "Set of flags that defines the test scope"
     required: false
     default: "-t @GHA"
-  LEDGER_URL:
+  IN_LEDGER_URL:
     description: "URL to the von network ledger browser"
     required: false
     default: "http://test.bcovrin.vonx.io"
-  PUBLIC_TAILS_URL:
+  IN_PUBLIC_TAILS_URL:
     description: "URL to the tails server"
     required: false
     default: "https://tails.vonx.io"
@@ -20,7 +20,7 @@ runs:
     - name: run-integration-tests-acapy
       # to run with external ledger and tails server run as follows (and remove the ledger and tails actions from the workflow):
       # run: LEDGER_URL=http://test.bcovrin.vonx.io PUBLIC_TAILS_URL=https://tails.vonx.io ./run_bdd ${{ inputs.TEST_SCOPE }}
-      run: LEDGER_URL=${{ inputs.LEDGER_URL }} PUBLIC_TAILS_URL=${{ PUBLIC_TAILS_URL }} ./run_bdd ${{ inputs.TEST_SCOPE }}
+      run: LEDGER_URL=${{inputs.IN_LEDGER_URL}} PUBLIC_TAILS_URL=${{inputs.IN_PUBLIC_TAILS_URL}} ./run_bdd ${{ inputs.TEST_SCOPE }}
       shell: bash
       env:
         NO_TTY: "1"