update env vars for den accounts in CI (#1243)

run-house · Sep 12, 2024 · de2ce3b · de2ce3b
1 parent 95baa6c
commit de2ce3b
Show file tree

Hide file tree

Showing 5 changed files with 72 additions and 72 deletions.
diff --git a/.github/workflows/cluster_tests.yaml b/.github/workflows/cluster_tests.yaml
@@ -34,7 +34,7 @@ jobs:
 
       - name: Run all cluster unit tests tests
         env:
-          TEST_TOKEN: ${{ secrets.TEST_TOKEN }}
+          KITCHEN_TESTER_TOKEN: ${{ secrets.KITCHEN_TESTER_PROD_TOKEN }}
         run: pytest -v tests/test_resources/test_cluster.py --level unit
 
       - name: Teardown all test clusters

diff --git a/.github/workflows/local_den_unit_tests.yaml b/.github/workflows/local_den_unit_tests.yaml
@@ -48,8 +48,8 @@ jobs:
       - name: Setup Runhouse Config
         uses: ./.github/workflows/setup_rh_config
         with:
-          username: ${{ secrets.TEST_USERNAME }}
-          token: ${{ secrets.TEST_TOKEN }}
+          username: ${{ secrets.DEN_TESTER_USERNAME }}
+          token: ${{ secrets.DEN_TESTER_PROD_TOKEN }}
 
       - name: Update Server URL in Runhouse Config
         run: |
@@ -63,6 +63,6 @@ jobs:
 
       - name: Run unit tests
         env:
-          TEST_TOKEN: ${{ secrets.TEST_TOKEN }}
-          TEST_USERNAME: ${{ secrets.TEST_USERNAME }}
+          KITCHEN_TESTER_TOKEN: ${{ secrets.KITCHEN_TESTER_PROD_TOKEN }}
+          KITCHEN_TESTER_USERNAME: ${{ secrets.KITCHEN_TESTER_USERNAME }}
         run: pytest -v --level unit
diff --git a/.github/workflows/local_tests.yaml b/.github/workflows/local_tests.yaml
@@ -40,14 +40,14 @@ jobs:
       - name: Setup ~/.rh/config.yaml
         uses: ./.github/workflows/setup_rh_config
         with:
-          username: ${{ secrets.CI_ACCOUNT_USERNAME }}
-          token: ${{ secrets.CI_ACCOUNT_TOKEN }}
+          username: ${{ secrets.DEN_TESTER_USERNAME }}
+          token: ${{ secrets.DEN_TESTER_PROD_TOKEN }}
           api_server_url: ${{ env.API_SERVER_URL }}
 
       - name: pytest -v --level local tests/test_servers/
         env:
-          TEST_TOKEN: ${{ secrets.TEST_TOKEN }}
-          TEST_USERNAME: ${{ secrets.TEST_USERNAME }}
+          KITCHEN_TESTER_TOKEN: ${{ secrets.KITCHEN_TESTER_PROD_TOKEN }}
+          KITCHEN_TESTER_USERNAME: ${{ secrets.KITCHEN_TESTER_USERNAME }}
         run: pytest -v --level local tests/test_servers/
         timeout-minutes: 60
 
@@ -78,15 +78,15 @@ jobs:
       - name: Setup ~/.rh/config.yaml
         uses: ./.github/workflows/setup_rh_config
         with:
-          username: ${{ secrets.CI_ACCOUNT_USERNAME }}
-          token: ${{ secrets.CI_ACCOUNT_TOKEN }}
+          username: ${{ secrets.DEN_TESTER_USERNAME }}
+          token: ${{ secrets.DEN_TESTER_PROD_TOKEN }}
           api_server_url: ${{ env.API_SERVER_URL }}
 
       - name: pytest -v --level local -k "not servertest and not secrettest and not moduletest and not functiontest and not envtest and not clustertest"
         env:
-          TEST_TOKEN: ${{ secrets.TEST_TOKEN }}
-          TEST_USERNAME: ${{ secrets.TEST_USERNAME }}
-          ORG_MEMBER_TOKEN: ${{ secrets.ORG_MEMBER_TOKEN }}
+          KITCHEN_TESTER_TOKEN: ${{ secrets.KITCHEN_TESTER_PROD_TOKEN }}
+          KITCHEN_TESTER_USERNAME: ${{ secrets.KITCHEN_TESTER_USERNAME }}
+          ORG_MEMBER_TOKEN: ${{ secrets.ORG_MEMBER_PROD_TOKEN }}
           ORG_MEMBER_USERNAME: ${{ secrets.ORG_MEMBER_USERNAME }}
         run: pytest -v --level local -k "not servertest and not secrettest and not moduletest and not functiontest and not envtest and not clustertest"
         timeout-minutes: 60
@@ -118,15 +118,15 @@ jobs:
       - name: Setup ~/.rh/config.yaml
         uses: ./.github/workflows/setup_rh_config
         with:
-          username: ${{ secrets.CI_ACCOUNT_USERNAME }}
-          token: ${{ secrets.CI_ACCOUNT_TOKEN }}
+          username: ${{ secrets.DEN_TESTER_USERNAME }}
+          token: ${{ secrets.DEN_TESTER_PROD_TOKEN }}
           api_server_url: ${{ env.API_SERVER_URL }}
 
       - name: pytest -v --level local -k "secrettest"
         env:
-          TEST_TOKEN: ${{ secrets.TEST_TOKEN }}
-          TEST_USERNAME: ${{ secrets.TEST_USERNAME }}
-          ORG_MEMBER_TOKEN: ${{ secrets.ORG_MEMBER_TOKEN }}
+          KITCHEN_TESTER_TOKEN: ${{ secrets.KITCHEN_TESTER_PROD_TOKEN }}
+          KITCHEN_TESTER_USERNAME: ${{ secrets.KITCHEN_TESTER_USERNAME }}
+          ORG_MEMBER_TOKEN: ${{ secrets.ORG_MEMBER_PROD_TOKEN }}
           ORG_MEMBER_USERNAME: ${{ secrets.ORG_MEMBER_USERNAME }}
         run: pytest -v --level local -k "secrettest"
         timeout-minutes: 60
@@ -143,15 +143,15 @@ jobs:
       - name: Setup ~/.rh/config.yaml
         uses: ./.github/workflows/setup_rh_config
         with:
-          username: ${{ secrets.CI_ACCOUNT_USERNAME }}
-          token: ${{ secrets.CI_ACCOUNT_TOKEN }}
+          username: ${{ secrets.DEN_TESTER_USERNAME }}
+          token: ${{ secrets.DEN_TESTER_PROD_TOKEN }}
           api_server_url: ${{ env.API_SERVER_URL }}
 
       - name: pytest -v --level local -k "moduletest"
         env:
-          TEST_TOKEN: ${{ secrets.TEST_TOKEN }}
-          TEST_USERNAME: ${{ secrets.TEST_USERNAME }}
-          ORG_MEMBER_TOKEN: ${{ secrets.ORG_MEMBER_TOKEN }}
+          KITCHEN_TESTER_TOKEN: ${{ secrets.KITCHEN_TESTER_PROD_TOKEN }}
+          KITCHEN_TESTER_USERNAME: ${{ secrets.KITCHEN_TESTER_USERNAME }}
+          ORG_MEMBER_TOKEN: ${{ secrets.ORG_MEMBER_PROD_TOKEN }}
           ORG_MEMBER_USERNAME: ${{ secrets.ORG_MEMBER_USERNAME }}
         run: pytest -v --level local -k "moduletest"
         timeout-minutes: 60
@@ -168,15 +168,15 @@ jobs:
       - name: Setup ~/.rh/config.yaml
         uses: ./.github/workflows/setup_rh_config
         with:
-          username: ${{ secrets.CI_ACCOUNT_USERNAME }}
-          token: ${{ secrets.CI_ACCOUNT_TOKEN }}
+          username: ${{ secrets.DEN_TESTER_USERNAME }}
+          token: ${{ secrets.DEN_TESTER_PROD_TOKEN }}
           api_server_url: ${{ env.API_SERVER_URL }}
 
       - name: pytest -v --level local -k "functiontest"
         env:
-          TEST_TOKEN: ${{ secrets.TEST_TOKEN }}
-          TEST_USERNAME: ${{ secrets.TEST_USERNAME }}
-          ORG_MEMBER_TOKEN: ${{ secrets.ORG_MEMBER_TOKEN }}
+          KITCHEN_TESTER_TOKEN: ${{ secrets.KITCHEN_TESTER_PROD_TOKEN }}
+          KITCHEN_TESTER_USERNAME: ${{ secrets.KITCHEN_TESTER_USERNAME }}
+          ORG_MEMBER_TOKEN: ${{ secrets.ORG_MEMBER_PROD_TOKEN }}
           ORG_MEMBER_USERNAME: ${{ secrets.ORG_MEMBER_USERNAME }}
         run: pytest -v --level local -k "functiontest"
         timeout-minutes: 60
@@ -193,15 +193,15 @@ jobs:
       - name: Setup ~/.rh/config.yaml
         uses: ./.github/workflows/setup_rh_config
         with:
-          username: ${{ secrets.CI_ACCOUNT_USERNAME }}
-          token: ${{ secrets.CI_ACCOUNT_TOKEN }}
+          username: ${{ secrets.DEN_TESTER_USERNAME }}
+          token: ${{ secrets.DEN_TESTER_PROD_TOKEN }}
           api_server_url: ${{ env.API_SERVER_URL }}
 
       - name: pytest -v --level local -k "envtest"
         env:
-          TEST_TOKEN: ${{ secrets.TEST_TOKEN }}
-          TEST_USERNAME: ${{ secrets.TEST_USERNAME }}
-          ORG_MEMBER_TOKEN: ${{ secrets.ORG_MEMBER_TOKEN }}
+          KITCHEN_TESTER_TOKEN: ${{ secrets.KITCHEN_TESTER_PROD_TOKEN }}
+          KITCHEN_TESTER_USERNAME: ${{ secrets.KITCHEN_TESTER_USERNAME }}
+          ORG_MEMBER_TOKEN: ${{ env.ORG_MEMBER_PROD_TOKEN }}
           ORG_MEMBER_USERNAME: ${{ secrets.ORG_MEMBER_USERNAME }}
         run: pytest -v --level local -k "envtest"
         timeout-minutes: 60
@@ -218,15 +218,15 @@ jobs:
       - name: Setup ~/.rh/config.yaml
         uses: ./.github/workflows/setup_rh_config
         with:
-          username: ${{ secrets.CI_ACCOUNT_USERNAME }}
-          token: ${{ secrets.CI_ACCOUNT_TOKEN }}
+          username: ${{ secrets.DEN_TESTER_USERNAME }}
+          token: ${{ secrets.DEN_TESTER_PROD_TOKEN }}
           api_server_url: ${{ env.API_SERVER_URL }}
 
       - name: pytest -v --level local -k "clustertest"
         env:
-          TEST_TOKEN: ${{ secrets.TEST_TOKEN }}
-          TEST_USERNAME: ${{ secrets.TEST_USERNAME }}
-          ORG_MEMBER_TOKEN: ${{ secrets.ORG_MEMBER_TOKEN }}
+          KITCHEN_TESTER_TOKEN: ${{ secrets.KITCHEN_TESTER_PROD_TOKEN }}
+          KITCHEN_TESTER_USERNAME: ${{ secrets.KITCHEN_TESTER_USERNAME }}
+          ORG_MEMBER_TOKEN: ${{ secrets.ORG_MEMBER_PROD_TOKEN }}
           ORG_MEMBER_USERNAME: ${{ secrets.ORG_MEMBER_USERNAME }}
         run: pytest -v --level local -k "clustertest"
         timeout-minutes: 60
diff --git a/.github/workflows/nightly_release_testing.yaml b/.github/workflows/nightly_release_testing.yaml
@@ -25,15 +25,15 @@ jobs:
           KUBECONFIG: ${{ secrets.KUBECONFIG }}
           GCP_SERVICE_ACCOUNT_KEY: ${{ secrets.GCP_SERVICE_ACCOUNT_KEY }}
           GCP_PROJECT_ID: ${{ secrets.GCP_PROJECT_ID }}
-          CI_ACCOUNT_TOKEN: ${{ secrets.CI_ACCOUNT_TOKEN }}
-          CI_ACCOUNT_USERNAME: ${{ secrets.CI_ACCOUNT_USERNAME }}
+          DEN_TESTER_TOKEN: ${{ secrets.DEN_TESTER_PROD_TOKEN }}
+          DEN_TESTER_USERNAME: ${{ secrets.DEN_TESTER_USERNAME }}
           API_SERVER_URL: ${{ env.API_SERVER_URL }}
 
       - name: Run not cluster tests
         env:
-          TEST_TOKEN: ${{ secrets.TEST_TOKEN }}
-          TEST_USERNAME: ${{ secrets.TEST_USERNAME }}
-          ORG_MEMBER_TOKEN: ${{ secrets.ORG_MEMBER_TOKEN }}
+          KITCHEN_TESTER_TOKEN: ${{ secrets.KITCHEN_TESTER_PROD_TOKEN }}
+          KITCHEN_TESTER_USERNAME: ${{ secrets.KITCHEN_TESTER_USERNAME }}
+          ORG_MEMBER_TOKEN: ${{ secrets.ORG_MEMBER_PROD_TOKEN }}
           ORG_MEMBER_USERNAME: ${{ secrets.ORG_MEMBER_USERNAME }}
         run: pytest --level release tests -k "not cluster" --detached
         timeout-minutes: 180
@@ -63,15 +63,15 @@ jobs:
           KUBECONFIG: ${{ secrets.KUBECONFIG }}
           GCP_SERVICE_ACCOUNT_KEY: ${{ secrets.GCP_SERVICE_ACCOUNT_KEY }}
           GCP_PROJECT_ID: ${{ secrets.GCP_PROJECT_ID }}
-          CI_ACCOUNT_TOKEN: ${{ secrets.CI_ACCOUNT_TOKEN }}
-          CI_ACCOUNT_USERNAME: ${{ secrets.CI_ACCOUNT_USERNAME }}
+          DEN_TESTER_TOKEN: ${{ secrets.DEN_TESTER_PROD_TOKEN }}
+          DEN_TESTER_USERNAME: ${{ secrets.DEN_TESTER_USERNAME }}
           API_SERVER_URL: ${{ env.API_SERVER_URL }}
 
       - name: Run cluster and not on-demand tests
         env:
-          TEST_TOKEN: ${{ secrets.TEST_TOKEN }}
-          TEST_USERNAME: ${{ secrets.TEST_USERNAME }}
-          ORG_MEMBER_TOKEN: ${{ secrets.ORG_MEMBER_TOKEN }}
+          KITCHEN_TESTER_TOKEN: ${{ secrets.KITCHEN_TESTER_PROD_TOKEN }}
+          KITCHEN_TESTER_USERNAME: ${{ secrets.KITCHEN_TESTER_USERNAME }}
+          ORG_MEMBER_TOKEN: ${{ secrets.ORG_MEMBER_PROD_TOKEN }}
           ORG_MEMBER_USERNAME: ${{ secrets.ORG_MEMBER_USERNAME }}
         run: pytest --level release tests -k "cluster and not ondemand" --detached
         timeout-minutes: 180
@@ -101,15 +101,15 @@ jobs:
           KUBECONFIG: ${{ secrets.KUBECONFIG }}
           GCP_SERVICE_ACCOUNT_KEY: ${{ secrets.GCP_SERVICE_ACCOUNT_KEY }}
           GCP_PROJECT_ID: ${{ secrets.GCP_PROJECT_ID }}
-          CI_ACCOUNT_TOKEN: ${{ secrets.CI_ACCOUNT_TOKEN }}
-          CI_ACCOUNT_USERNAME: ${{ secrets.CI_ACCOUNT_USERNAME }}
+          DEN_TESTER_TOKEN: ${{ secrets.DEN_TESTER_PROD_TOKEN }}
+          DEN_TESTER_USERNAME: ${{ secrets.DEN_TESTER_USERNAME }}
           API_SERVER_URL: ${{ env.API_SERVER_URL }}
 
       - name: Run on-demand aws tests
         env:
-          TEST_TOKEN: ${{ secrets.TEST_TOKEN }}
-          TEST_USERNAME: ${{ secrets.TEST_USERNAME }}
-          ORG_MEMBER_TOKEN: ${{ secrets.ORG_MEMBER_TOKEN }}
+          KITCHEN_TESTER_TOKEN: ${{ secrets.KITCHEN_TESTER_PROD_TOKEN }}
+          KITCHEN_TESTER_USERNAME: ${{ secrets.KITCHEN_TESTER_USERNAME }}
+          ORG_MEMBER_TOKEN: ${{ secrets.ORG_MEMBER_PROD_TOKEN }}
           ORG_MEMBER_USERNAME: ${{ secrets.ORG_MEMBER_USERNAME }}
         run: pytest --level release tests -k "ondemand_aws_docker_cluster" --detached
         timeout-minutes: 180
@@ -139,15 +139,15 @@ jobs:
           AWS_OSS_ROLE_ARN: ${{ secrets.AWS_OSS_ROLE_ARN }}
           DEV_AWS_ACCESS_KEY: ${{ secrets.DEV_AWS_ACCESS_KEY }}
           DEV_AWS_SECRET_KEY: ${{ secrets.DEV_AWS_SECRET_KEY }}
-          CI_ACCOUNT_TOKEN: ${{ secrets.CI_ACCOUNT_TOKEN }}
-          CI_ACCOUNT_USERNAME: ${{ secrets.CI_ACCOUNT_USERNAME }}
+          DEN_TESTER_TOKEN: ${{ secrets.DEN_TESTER_PROD_TOKEN }}
+          DEN_TESTER_USERNAME: ${{ secrets.DEN_TESTER_USERNAME }}
           API_SERVER_URL: ${{ env.API_SERVER_URL }}
 
       - name:  Run on-demand gcp tests
         env:
-          TEST_TOKEN: ${{ secrets.TEST_TOKEN }}
-          TEST_USERNAME: ${{ secrets.TEST_USERNAME }}
-          ORG_MEMBER_TOKEN: ${{ secrets.ORG_MEMBER_TOKEN }}
+          KITCHEN_TESTER_TOKEN: ${{ secrets.KITCHEN_TESTER_PROD_TOKEN }}
+          KITCHEN_TESTER_USERNAME: ${{ secrets.KITCHEN_TESTER_USERNAME }}
+          ORG_MEMBER_TOKEN: ${{ secrets.ORG_MEMBER_PROD_TOKEN }}
           ORG_MEMBER_USERNAME: ${{ secrets.ORG_MEMBER_USERNAME }}
         run: pytest --level release tests -k "ondemand_gcp_cluster" --detached
         timeout-minutes: 180
@@ -177,15 +177,15 @@ jobs:
           DEV_AWS_SECRET_KEY: ${{ secrets.DEV_AWS_SECRET_KEY }}
           GCP_SERVICE_ACCOUNT_KEY: ${{ secrets.GCP_SERVICE_ACCOUNT_KEY }}
           GCP_PROJECT_ID: ${{ secrets.GCP_PROJECT_ID }}
-          CI_ACCOUNT_TOKEN: ${{ secrets.CI_ACCOUNT_TOKEN }}
-          CI_ACCOUNT_USERNAME: ${{ secrets.CI_ACCOUNT_USERNAME }}
+          DEN_TESTER_TOKEN: ${{ secrets.DEN_TESTER_PROD_TOKEN }}
+          DEN_TESTER_USERNAME: ${{ secrets.DEN_TESTER_USERNAME }}
           API_SERVER_URL: ${{ env.API_SERVER_URL }}
 
       - name: Run kubernetes tests
         env:
-          TEST_TOKEN: ${{ secrets.TEST_TOKEN }}
-          TEST_USERNAME: ${{ secrets.TEST_USERNAME }}
-          ORG_MEMBER_TOKEN: ${{ secrets.ORG_MEMBER_TOKEN }}
+          KITCHEN_TESTER_TOKEN: ${{ secrets.KITCHEN_TESTER_PROD_TOKEN }}
+          KITCHEN_TESTER_USERNAME: ${{ secrets.KITCHEN_TESTER_USERNAME }}
+          ORG_MEMBER_TOKEN: ${{ secrets.ORG_MEMBER_PROD_TOKEN }}
           ORG_MEMBER_USERNAME: ${{ secrets.ORG_MEMBER_USERNAME }}
         run: pytest --level release tests -k "ondemand_k8s_cluster" --detached
         timeout-minutes: 180
@@ -222,8 +222,8 @@ jobs:
           DEV_AWS_SECRET_KEY: ${{ secrets.DEV_AWS_SECRET_KEY }}
           GCP_SERVICE_ACCOUNT_KEY: ${{ secrets.GCP_SERVICE_ACCOUNT_KEY }}
           GCP_PROJECT_ID: ${{ secrets.GCP_PROJECT_ID }}
-          CI_ACCOUNT_TOKEN: ${{ secrets.CI_ACCOUNT_TOKEN }}
-          CI_ACCOUNT_USERNAME: ${{ secrets.CI_ACCOUNT_USERNAME }}
+          DEN_TESTER_TOKEN: ${{ secrets.DEN_TESTER_PROD_TOKEN }}
+          DEN_TESTER_USERNAME: ${{ secrets.DEN_TESTER_USERNAME }}
           API_SERVER_URL: ${{ env.API_SERVER_URL }}
 
       - name: Wait to check cluster status

diff --git a/.github/workflows/setup_release_testing/action.yaml b/.github/workflows/setup_release_testing/action.yaml
@@ -20,11 +20,11 @@ inputs:
   KUBECONFIG:
     description: 'Kubeconfig'
     required: false
-  CI_ACCOUNT_TOKEN:
-    description: 'CI Token'
+  DEN_TESTER_TOKEN:
+    description: 'Den Tester Token'
     required: true
-  CI_ACCOUNT_USERNAME:
-    description: 'CI Username'
+  DEN_TESTER_USERNAME:
+    description: 'Den Tester Username'
     required: true
   API_SERVER_URL:
     description: 'API Server URL'
@@ -85,6 +85,6 @@ runs:
     - name: Setup ~/.rh/config.yaml
       uses: ./.github/workflows/setup_rh_config
       with:
-        username: ${{ inputs.CI_ACCOUNT_USERNAME }}
-        token: ${{ inputs.CI_ACCOUNT_TOKEN }}
+        username: ${{ inputs.DEN_TESTER_USERNAME }}
+        token: ${{ inputs.DEN_TESTER_TOKEN }}
         api_server_url: ${{ inputs.API_SERVER_URL }}