Skip to content

Commit 1eb83fa

Browse files
- CICD cleaned.
1 parent a82b45e commit 1eb83fa

File tree

4 files changed

+19
-10
lines changed

4 files changed

+19
-10
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: build
1+
name: buildexpt
22

33
on:
44
push:
Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ jobs:
3333
winbuild:
3434
name: Windows Build
3535
runs-on: windows-latest
36+
timeout-minutes: ${{ vars.DEFAULT_JOB_TIMEOUT_MIN == '' && '120' || vars.DEFAULT_JOB_TIMEOUT_MIN }}
3637
steps:
3738

3839
- name: Get rid of disruptive line endings before checkout
@@ -78,7 +79,7 @@ jobs:
7879
- name: Set up mingw
7980
uses: egor-tensin/setup-mingw@v2.2.0
8081
id: gccsetup
81-
timeout-minutes: 20
82+
timeout-minutes: ${{ vars.DEFAULT_STEP_TIMEOUT_MIN == '' && '20' || vars.DEFAULT_STEP_TIMEOUT_MIN }}
8283
with:
8384
version: '8.1.0'
8485

@@ -93,13 +94,13 @@ jobs:
9394
9495
- name: Choco install openssl
9596
uses: crazy-max/ghaction-chocolatey@v3.0.0
96-
timeout-minutes: 40
97+
timeout-minutes: ${{ vars.DEFAULT_LONG_STEP_TIMEOUT_MIN == '' && '40' || vars.DEFAULT_LONG_STEP_TIMEOUT_MIN }}
9798
with:
9899
args: "install --force openssl --version 3.1.1"
99100

100101
- name: Choco install packages
101102
uses: crazy-max/ghaction-chocolatey@v3.0.0
102-
timeout-minutes: 40
103+
timeout-minutes: ${{ vars.DEFAULT_LONG_STEP_TIMEOUT_MIN == '' && '40' || vars.DEFAULT_LONG_STEP_TIMEOUT_MIN }}
103104
with:
104105
args: "install --force postgresql13 sqlite"
105106

@@ -206,6 +207,7 @@ jobs:
206207
linuxbuild:
207208
name: Linux Build
208209
runs-on: ubuntu-latest
210+
timeout-minutes: ${{ vars.DEFAULT_JOB_TIMEOUT_MIN == '' && '120' || vars.DEFAULT_JOB_TIMEOUT_MIN }}
209211
steps:
210212

211213
- name: Check out code into the Go module directory
@@ -463,6 +465,7 @@ jobs:
463465
linuxarmbuild:
464466
name: Linux arm64 Build
465467
runs-on: arm-ubuntu-22-04-runner-one
468+
timeout-minutes: ${{ vars.DEFAULT_JOB_TIMEOUT_MIN == '' && '120' || vars.DEFAULT_JOB_TIMEOUT_MIN }}
466469
steps:
467470

468471
- name: Check out code into the Go module directory
@@ -746,6 +749,7 @@ jobs:
746749
name: WSL Test
747750
runs-on: windows-latest
748751
needs: linuxbuild
752+
timeout-minutes: ${{ vars.DEFAULT_JOB_TIMEOUT_MIN == '' && '120' || vars.DEFAULT_JOB_TIMEOUT_MIN }}
749753
steps:
750754

751755
- name: Get rid of disruptive line endings before checkout
@@ -860,6 +864,7 @@ jobs:
860864
macosbuild:
861865
name: MacOS Build
862866
runs-on: macos-12
867+
timeout-minutes: ${{ vars.DEFAULT_JOB_TIMEOUT_MIN == '' && '120' || vars.DEFAULT_JOB_TIMEOUT_MIN }}
863868
steps:
864869
- name: Check out code into the Go module directory
865870
uses: actions/checkout@v4.1.1
@@ -998,6 +1003,7 @@ jobs:
9981003
macosarmbuild:
9991004
name: MacOS ARM Build
10001005
runs-on: macos-latest
1006+
timeout-minutes: ${{ vars.DEFAULT_JOB_TIMEOUT_MIN == '' && '120' || vars.DEFAULT_JOB_TIMEOUT_MIN }}
10011007
steps:
10021008

10031009
- name: Check out code into the Go module directory
@@ -1075,6 +1081,7 @@ jobs:
10751081
dockerbuild:
10761082
name: Docker Build
10771083
runs-on: ubuntu-latest-m
1084+
timeout-minutes: ${{ vars.DEFAULT_JOB_TIMEOUT_MIN == '' && '120' || vars.DEFAULT_JOB_TIMEOUT_MIN }}
10781085
steps:
10791086

10801087
- name: Check out code into the Go module directory
@@ -1227,13 +1234,13 @@ jobs:
12271234
12281235
- name: Run robot mocked functional tests
12291236
if: success()
1230-
timeout-minutes: 20
1237+
timeout-minutes: ${{ vars.DEFAULT_STEP_TIMEOUT_MIN == '' && '20' || vars.DEFAULT_STEP_TIMEOUT_MIN }}
12311238
run: |
12321239
python cicd/python/build.py --robot-test --config='{ "variables": { "EXECUTION_PLATFORM": "docker" } }'
12331240
12341241
- name: Run POSTGRES BACKEND robot mocked functional tests
12351242
if: success()
1236-
timeout-minutes: 20
1243+
timeout-minutes: ${{ vars.DEFAULT_STEP_TIMEOUT_MIN == '' && '20' || vars.DEFAULT_STEP_TIMEOUT_MIN }}
12371244
run: |
12381245
echo "## Stray docker containers before postgres robot tests ##"
12391246
docker container ls --format "table {{.ID}}\t{{.Names}}\t{{.Ports}}" -a

test/python/oauth2_token.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@
66
def create_token(header: dict, claims: dict) -> str:
77
"""
88
Create a token from the claims.
9+
10+
TODO: Implement the signature.
911
"""
1012
header_b64 = base64.urlsafe_b64encode(json.dumps(header, sort_keys=True).encode('utf-8')).decode('utf-8')
1113
claims_b64 = base64.urlsafe_b64encode(json.dumps(claims, sort_keys=True).encode('utf-8')).decode('utf-8')
12-
signature = f'{header_b64}.{claims_b64}'
13-
14+
signature = f'{header_b64}.{claims_b64}' # placeholder rubbish
1415
return f'{header_b64}.{claims_b64}.{base64.urlsafe_b64encode(signature.encode("utf-8")).decode("utf-8")}'
1516

1617

test/robot/lib/web_service_keywords.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ def __init__(self):
2626
@keyword
2727
def create_oauth2_client_credentials_web_service(
2828
self,
29-
port: int
29+
port: int,
30+
host: str = '0.0.0.0'
3031
) -> None:
3132
"""
3233
Sign the input.
@@ -35,7 +36,7 @@ def create_oauth2_client_credentials_web_service(
3536
'flask',
3637
f'--app={self._web_server_app}',
3738
'run',
38-
'--host=0.0.0.0', # otherwise, invisible on `docker.host.internal` etc
39+
f'--host={host}', # generally, `0.0.0.0`; otherwise, invisible on `docker.host.internal` etc
3940
f'--port={port}',
4041
stdout=os.path.abspath(os.path.join(os.path.dirname(__file__), '..', 'log', f'token-client-credentials-{port}-stdout.txt')),
4142
stderr=os.path.abspath(os.path.join(os.path.dirname(__file__), '..', 'log', f'token-client-credentials-{port}-stderr.txt'))

0 commit comments

Comments
 (0)