From f53bd76483c297d3dc158421ba8f99e12716c266 Mon Sep 17 00:00:00 2001 From: Lars Falk-Petersen Date: Wed, 25 Sep 2024 14:43:24 +0200 Subject: [PATCH] Sedr version --- .gitlab-ci.yml | 5 +++-- tox.ini | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6d87c14..cc43c47 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -140,6 +140,7 @@ testapi: rules: - if: $CI_COMMIT_TAG script: + - VALIDATOR_IMAGE="ghcr.io/metno/sedr:0.7.4-2" - LAST_GIT_TAG=$(git describe --tags --match="v[0-9]*" --abbrev=0) - RELEASE_TAG="${LAST_GIT_TAG}-${CI_PIPELINE_IID}" - RELEASE_IMAGE_NAME="${CI_REGISTRY_IMAGE}:${RELEASE_TAG}" @@ -149,7 +150,7 @@ testapi: - docker pull $RELEASE_IMAGE_NAME - docker run --tty=true --detach=true --network=host $RELEASE_IMAGE_NAME --bind_host 0.0.0.0 - echo "Testing API with ghcr.io/metno/sedr" - - docker pull ghcr.io/metno/sedr - - docker run --tty=true --network=host --rm ghcr.io/metno/sedr --openapi http://localhost:5000/api --url http://localhost:5000 + - docker pull $VALIDATOR_IMAGE + - docker run --tty=true --network=host --rm $VALIDATOR_IMAGE --openapi http://localhost:5000/api --url http://localhost:5000 dependencies: - build_image diff --git a/tox.ini b/tox.ini index a298e50..ae46d7d 100644 --- a/tox.ini +++ b/tox.ini @@ -47,6 +47,7 @@ commands = bandit --recursive . skip_install = true [testenv:sedr] +; Remember to update sedr version in .gitlab-ci.yml too ignore_outcome = true change_dir = app description = WIP! Start app in background, wait for startup, run sedr to validate API, kill background process based on port number.