Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

updated tokens for dev ci testing #1236

Merged
merged 1 commit into from
Sep 12, 2024
Merged

updated tokens for dev ci testing #1236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 35 additions & 36 deletions .github/workflows/local_tests_den_dev.yaml
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion tests/test_login.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ def add_secrets_to_vault(headers):


def test_login_flow_in_new_env():
token = os.getenv("TEST_TOKEN")
token = os.getenv("KITCHEN_TESTER_TOKEN")
headers = {"Authorization": f"Bearer {token}"}

add_secrets_to_vault(headers)
Expand Down
8 changes: 5 additions & 3 deletions tests/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,14 @@ def friend_account():

try:
account = rns_client.load_account_from_env(
token_env_var="TEST_TOKEN",
usr_env_var="TEST_USERNAME",
token_env_var="KITCHEN_TESTER_TOKEN",
usr_env_var="KITCHEN_TESTER_USERNAME",
dotenv_path=dotenv_path,
)
if account is None:
pytest.skip("`TEST_TOKEN` or `TEST_USERNAME` not set, skipping test.")
pytest.skip(
"`KITCHEN_TESTER_TOKEN` or `KITCHEN_TESTER_USERNAME` not set, skipping test."
)
yield account

finally:
Expand Down
Loading