Skip to content

Commit 5b258fa

Browse files
committed
chore: update studio ci test
1 parent f419677 commit 5b258fa

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

.ci/tests/studio/studio.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ fi
3232
fedn studio login -u $STUDIO_USER -P $STUDIO_PASSWORD -H $STUDIO_HOST
3333
TAG=sha-$(git rev-parse HEAD | cut -c1-7)
3434
PROJECT_NAME=citest_$TAG
35-
fedn project create -n $PROJECT_NAME -H $STUDIO_HOST --branch main --repository ghcr.io/scaleoutsystems/fedn --image fedn:$TAG --no-interactive
35+
fedn project create -n $PROJECT_NAME -H $STUDIO_HOST --branch $STUDIO_BRANCH --repository ghcr.io/scaleoutsystems/fedn --image fedn:$TAG --no-interactive
3636
for i in {1..10}; do echo "Attempt $i of 10"; if ! fedn project list -H $STUDIO_HOST | awk -F'|' -v project="$PROJECT_NAME" '$1 ~ project {gsub(/^[ \t]+|[ \t]+$/, "", $4); if ($4 == "active") {exit 1} else {exit 0}}'; then echo "Status is active, exiting"; break; else echo "Status is not active, sleeping..."; sleep 5; fi; done
3737
FEDN_PROJECT=$(fedn project list -H $STUDIO_HOST | awk -F'|' -v project="$PROJECT_NAME" '$1 ~ project {gsub(/^[ \t]+|[ \t]+$/, "", $2); print $2}')
3838
fedn project set-context -id $FEDN_PROJECT -H $STUDIO_HOST

.github/workflows/integration-test-studio.yaml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@ on:
4141
description: 'Array Size Factor, used in load-test, 1 = 144MB'
4242
required: false
4343
default: '1'
44-
FEDN_CLIENT_TIMEOUT:
45-
description: 'Client Connection Timeout (OBS - not related to round timeout)'
44+
STUDIO_BRANCH:
45+
description: 'Branch to test fedn chart'
4646
required: false
47-
default: '420'
47+
default: 'main'
4848

4949
jobs:
5050
integration-test:
@@ -84,8 +84,9 @@ jobs:
8484
echo "FEDN_NR_EXPECTED_AGG=${{ github.event.inputs.FEDN_NR_EXPECTED_AGG || '2' }}" >> .ci/tests/studio/.env
8585
echo "FEDN_SESSION_TIMEOUT=${{ github.event.inputs.FEDN_SESSION_TIMEOUT || '420' }}" >> .ci/tests/studio/.env
8686
echo "FEDN_ARRAY_SIZE_FACTOR=${{ github.event.inputs.FEDN_ARRAY_SIZE_FACTOR || '1' }}" >> .ci/tests/studio/.env
87-
echo "FEDN_CLIENT_TIMEOUT=${{ github.event.inputs.FEDN_CLIENT_TIMEOUT || '420' }}" >> .ci/tests/studio/.env
87+
echo "FEDN_CLIENT_TIMEOUT=420" >> .ci/tests/studio/.env
8888
echo "FEDN_PACKAGE_EXTRACT_DIR=client" >> .ci/tests/studio/.env
89+
echo "STUDIO_BRANCH=${{ github.event.inputs.STUDIO_BRANCH || 'main' }}" >> .ci/tests/studio/.env
8990
9091
- name: Run integration tests
9192
env:

0 commit comments

Comments
 (0)