Merge branch 'master' into dev-parallel

kbaseapps · Jan 9, 2024 · f24b26a · f24b26a
2 parents 551481e + a79a233
commit f24b26a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/.github/workflows/kb_sdk_test.yaml b/.github/workflows/kb_sdk_test.yaml
@@ -28,7 +28,7 @@ jobs:
       if: "!contains(github.event.head_commit.message, 'skip ci')"
       shell: bash
       env:
-        KBASE_TEST_TOKEN: ${{ secrets.KBASE_TEST_TOKEN }}
+        KBASE_TEST_TOKEN: ${{ secrets.KBASE_CI_TOKEN }}
       run: |
         # Verify kb_sdk_actions clone worked
         test -f "$HOME/kb_sdk_actions/bin/kb-sdk" && echo "CI files cloned"
@@ -42,10 +42,15 @@ jobs:
       if: "!contains(github.event.head_commit.message, 'skip ci')"
       shell: bash
       env:
-        KBASE_TEST_TOKEN: ${{ secrets.KBASE_TEST_TOKEN }}
+        KBASE_TEST_TOKEN: ${{ secrets.KBASE_CI_TOKEN }}
+        KBASE_TEST_TOKEN2: ${{ secrets.KBASE_CI_TOKEN2 }}
       run: |
         # Add token to config
         sed -ie "s/^test_token=.*$/&$KBASE_TEST_TOKEN/g" ./test_local/test.cfg
+        # Change deployment env from appdev to ci
+        sed -ie "s+https://appdev.kbase.us+https://ci.kbase.us+g" ./test_local/test.cfg
+        # Add second user credentials 
+        echo "test_token2=$KBASE_TEST_TOKEN2" >> ./test_local/test.cfg
 
     - name: Run tests
       if: "!contains(github.event.head_commit.message, 'skip ci')"

diff --git a/README.md b/README.md
@@ -16,6 +16,8 @@ The tests use data from KBase's CI environment. In `test_local/test.cfg`, set th
 
 ```
 test_token={ci_dev_token}
+# a second test token from a different account is required
+test_token2={ci_dev_token2}
 kbase_endpoint=https://ci.kbase.us/services
 auth_service_url=https://ci.kbase.us/services/auth/api/legacy/KBase/Sessions/Login
 ```