Skip to content

Commit 64ca2a0

Browse files
committed
fix(ci): set more consistent env
1 parent 3d09d57 commit 64ca2a0

File tree

2 files changed

+13
-7
lines changed

2 files changed

+13
-7
lines changed

.github/workflows/integration-gateway.yml

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,6 @@ on:
1111
permissions:
1212
contents: read
1313

14-
env:
15-
SCW_DEFAULT_ORGANIZATION_ID: ${{ secrets.SCW_DEFAULT_ORGANIZATION_ID }}
16-
SCW_SECRET_KEY: ${{ secrets.SCW_SECRET_KEY }}
17-
SCW_ACCESS_KEY: ${{ secrets.SCW_ACCESS_KEY }}
18-
SCW_DEFAULT_PROJECT_ID: ${{ secrets.SCW_DEFAULT_PROJECT_ID }}
19-
2014
jobs:
2115
setup-gateway:
2216
runs-on: self-hosted
@@ -28,6 +22,10 @@ jobs:
2822

2923
- name: Deploy Serverless Gateway
3024
run: poetry run scwgw deploy
25+
env:
26+
SCW_DEFAULT_ORGANIZATION_ID: ${{ secrets.SCW_DEFAULT_ORGANIZATION_ID }}
27+
SCW_SECRET_KEY: ${{ secrets.SCW_SECRET_KEY }}
28+
SCW_ACCESS_KEY: ${{ secrets.SCW_ACCESS_KEY }}
3129

3230
run-tests:
3331
needs:
@@ -44,6 +42,10 @@ jobs:
4442
run: |
4543
poetry run scwgw remote-config
4644
poetry run pytest integrations/gateway -n $(nproc --all)
45+
env:
46+
SCW_DEFAULT_ORGANIZATION_ID: ${{ secrets.SCW_DEFAULT_ORGANIZATION_ID }}
47+
SCW_SECRET_KEY: ${{ secrets.SCW_SECRET_KEY }}
48+
SCW_ACCESS_KEY: ${{ secrets.SCW_ACCESS_KEY }}
4749

4850
teardown-gateway:
4951
runs-on: self-hosted
@@ -61,3 +63,7 @@ jobs:
6163

6264
- name: Delete Serverless Gateway
6365
run: poetry run scwgw delete
66+
env:
67+
SCW_DEFAULT_ORGANIZATION_ID: ${{ secrets.SCW_DEFAULT_ORGANIZATION_ID }}
68+
SCW_SECRET_KEY: ${{ secrets.SCW_SECRET_KEY }}
69+
SCW_ACCESS_KEY: ${{ secrets.SCW_ACCESS_KEY }}

scw_serverless/gateway/serverless_gateway.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ def __init__(self) -> None:
2727
# Verify that the CLI is installed and working
2828
cmd = self._invoke_cli(["check"])
2929
for line in cmd.stdout.splitlines():
30-
if not line.endswith("ready"):
30+
if "status" in line and not line.endswith("ready"):
3131
click.secho(f"scwgw is not ready: {line}", fg="red")
3232
raise RuntimeError("scwgw is not ready")
3333

0 commit comments

Comments
 (0)