From d35b56ec34513aa229af995dcea1f823b3796a98 Mon Sep 17 00:00:00 2001
From: nguyed99 <nguyed99@zedat.fu-berlin.de>
Date: Fri, 19 Jan 2024 21:10:31 +0100
Subject: [PATCH] Update pipeline
---
.gitlab-ci.yml | 6 ++----
README.md | 2 +-
build/build-image-CI.sh | 21 -------------------
.../{build-image-local.sh => build-image.sh} | 0
4 files changed, 3 insertions(+), 26 deletions(-)
delete mode 100644 build/build-image-CI.sh
rename build/{build-image-local.sh => build-image.sh} (100%)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e3cf818..f174ef0 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 eb7f191..722a6b9 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 b109109..0000000
--- 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
--
GitLab