Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into local-telemetry-agent
Browse files Browse the repository at this point in the history
  • Loading branch information
jlewitt1 committed Sep 16, 2024
2 parents 2f52ff7 + e8d9661 commit 71b6c1a
Show file tree
Hide file tree
Showing 60 changed files with 1,284 additions and 645 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build_docs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- name: Build docs
run: cd docs && make html && cd ..
- name: Upload artifacts
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: docs
path: docs/_build/html
2 changes: 1 addition & 1 deletion .github/workflows/cluster_tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/local_den_unit_tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand All @@ -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
68 changes: 34 additions & 34 deletions .github/workflows/local_tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
71 changes: 35 additions & 36 deletions .github/workflows/local_tests_den_dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ jobs:

# - name: pytest -v --level local tests/test_servers/
# env:
# TEST_TOKEN: ${{ secrets.TEST_TOKEN }}
# TEST_USERNAME: ${{ secrets.TEST_USERNAME }}
# KITCHEN_TESTER_DEV_TOKEN: ${{ secrets.KITCHEN_TESTER_DEV_TOKEN }}
# KITCHEN_TESTER_USERNAME: ${{ secrets.KITCHEN_TESTER_USERNAME }}
# run: pytest -v --level local tests/test_servers/

server-tests-logged-in-level-local:
Expand All @@ -37,15 +37,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_DEV_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_DEV_TOKEN }}
KITCHEN_TESTER_USERNAME: ${{ secrets.KITCHEN_TESTER_USERNAME }}
run: pytest -v --level local tests/test_servers/ --api-server-url $API_SERVER_URL
timeout-minutes: 60

Expand All @@ -60,8 +59,8 @@ jobs:

# - name: pytest -v --level local -k "not servertest and not secrettest"
# env:
# TEST_TOKEN: ${{ secrets.TEST_TOKEN }}
# TEST_USERNAME: ${{ secrets.TEST_USERNAME }}
# KITCHEN_TESTER_DEV_TOKEN: ${{ secrets.KITCHEN_TESTER_DEV_TOKEN }}
# KITCHEN_TESTER_USERNAME: ${{ secrets.KITCHEN_TESTER_USERNAME }}
# run: pytest -v --level local -k "not servertest and not secrettest"

most-tests-logged-in-level-local:
Expand All @@ -76,15 +75,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_DEV_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"
env:
TEST_TOKEN: ${{ secrets.TEST_TOKEN }}
TEST_USERNAME: ${{ secrets.TEST_USERNAME }}
ORG_MEMBER_TOKEN: ${{ secrets.ORG_MEMBER_TOKEN }}
KITCHEN_TESTER_TOKEN: ${{ secrets.KITCHEN_TESTER_DEV_TOKEN }}
KITCHEN_TESTER_USERNAME: ${{ secrets.KITCHEN_TESTER_USERNAME }}
ORG_MEMBER_TOKEN: ${{ secrets.ORG_MEMBER_DEV_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" --api-server-url $API_SERVER_URL
timeout-minutes: 60
Expand All @@ -100,8 +99,8 @@ jobs:

# - name: pytest -v --level local -k "secrettest"
# env:
# TEST_TOKEN: ${{ secrets.TEST_TOKEN }}
# TEST_USERNAME: ${{ secrets.TEST_USERNAME }}
# KITCHEN_TESTER_DEV_TOKEN: ${{ secrets.KITCHEN_TESTER_DEV_TOKEN }}
# KITCHEN_TESTER_USERNAME: ${{ secrets.KITCHEN_TESTER_USERNAME }}
# run: pytest -v --level local -k "secrettest"

secret-tests-logged-in-level-local:
Expand All @@ -116,15 +115,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_DEV_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_DEV_TOKEN }}
KITCHEN_TESTER_USERNAME: ${{ secrets.KITCHEN_TESTER_USERNAME }}
ORG_MEMBER_TOKEN: ${{ secrets.ORG_MEMBER_DEV_TOKEN }}
ORG_MEMBER_USERNAME: ${{ secrets.ORG_MEMBER_USERNAME }}
run: pytest -v --level local -k "secrettest" --api-server-url $API_SERVER_URL
timeout-minutes: 60
Expand All @@ -141,15 +140,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_DEV_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_DEV_TOKEN }}
KITCHEN_TESTER_USERNAME: ${{ secrets.KITCHEN_TESTER_USERNAME }}
ORG_MEMBER_TOKEN: ${{ secrets.ORG_MEMBER_DEV_TOKEN }}
ORG_MEMBER_USERNAME: ${{ secrets.ORG_MEMBER_USERNAME }}
run: pytest -v --level local -k "moduletest" --api-server-url $API_SERVER_URL
timeout-minutes: 60
Expand All @@ -166,15 +165,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_DEV_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_DEV_TOKEN }}
KITCHEN_TESTER_USERNAME: ${{ secrets.KITCHEN_TESTER_USERNAME }}
ORG_MEMBER_TOKEN: ${{ secrets.ORG_MEMBER_DEV_TOKEN }}
ORG_MEMBER_USERNAME: ${{ secrets.ORG_MEMBER_USERNAME }}
run: pytest -v --level local -k "functiontest" --api-server-url $API_SERVER_URL
timeout-minutes: 60
Expand All @@ -191,15 +190,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_DEV_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_DEV_TOKEN }}
KITCHEN_TESTER_USERNAME: ${{ secrets.KITCHEN_TESTER_USERNAME }}
ORG_MEMBER_TOKEN: ${{ secrets.ORG_MEMBER_DEV_TOKEN }}
ORG_MEMBER_USERNAME: ${{ secrets.ORG_MEMBER_USERNAME }}
run: pytest -v --level local -k "envtest" --api-server-url $API_SERVER_URL
timeout-minutes: 60
Loading

0 comments on commit 71b6c1a

Please sign in to comment.