diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e3cf818ae003e9e11ecfd783deb6d4e6030382c9..f174ef0c4c7662889b0fd4d8082b18eb9689ce31 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -22,11 +22,9 @@ build-env: test-jobs: stage: test-jobs script: - - source $(poetry env info --path)/bin/activate - - pytest jobs/tests/ + - poetry run pytest jobs/tests/ test-tasks: stage: test-tasks script: - - source $(poetry env info --path)/bin/activate - - pytest tasks/tests/ \ No newline at end of file + - poetry run pytest tasks/tests/ \ No newline at end of file diff --git a/README.md b/README.md index eb7f1916cb765a656d82d4b265277a1c4545b6ca..722a6b9ef1f1df92c44698281761a9ecacc3bf23 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ All folders are isolated projects. `cd` into the folder to run/build them. Jobs and tasks are run inside of docker containers. There is a docker build script (`Dockerfile`) and can be run in `dev` mode via `docker run`. Please be aware it can take a while to build the initial image. At root directory, to build the image run: - bash build/build_image_local.sh + bash build/build-image.sh The image is built now and ready to be used! The tests in the Docker container built from the image can be sanity-checked via : diff --git a/build/build-image-CI.sh b/build/build-image-CI.sh deleted file mode 100644 index b1091093e91d73823d897cc806529290ae5c2129..0000000000000000000000000000000000000000 --- a/build/build-image-CI.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash -set -e - -CWD=$(cd $(dirname $0); pwd) - -REGISTRY=git.imp.fu-berlin.de:5000/nguyed99/comp-sci-project - -IMAGE=${REGISTRY}/jobs-n-tasks:${RELEASE:-CI} -BASE_VERSION="3.11.5-slim" - -echo Building $IMAGE -docker build \ - --force-rm \ - --rm=true \ - -f "$CWD/Dockerfile" \ - --platform linux/amd64 \ - --build-arg BASE_VERSION=$BASE_VERSION \ - -t $IMAGE \ - "$CWD/.." - -docker push $IMAGE \ No newline at end of file diff --git a/build/build-image-local.sh b/build/build-image.sh similarity index 100% rename from build/build-image-local.sh rename to build/build-image.sh