From 7a67b433f10a9e702496274f9aff9589c47afe5f Mon Sep 17 00:00:00 2001 From: Matt Bovel <matthieu.bovel@epfl.ch> Date: Wed, 25 May 2022 12:24:15 +0000 Subject: [PATCH] Update grading-gitlab-ci.yml --- grading-gitlab-ci.yml | 30 +++++++----------------------- 1 file changed, 7 insertions(+), 23 deletions(-) diff --git a/grading-gitlab-ci.yml b/grading-gitlab-ci.yml index 4f8a333..f8fdce6 100644 --- a/grading-gitlab-ci.yml +++ b/grading-gitlab-ci.yml @@ -17,47 +17,31 @@ variables: compile: stage: build - timeout: 15m - image: lampepfl2022/cs206:compile + timeout: 10m + image: ${DOCKER_REPO}/compile tags: - - cs206 + - cs210 except: - tags - master - - exercise-1 - - exercise-2 - - exercise-3 - - exercise-4 - - exercise-5 - - exercise-6 - - exercise-7 - - exercise-8 script: - sbt packageSubmission # Output of this job that needs to be stored to be reused in the grade job below artifacts: - expire_in: 1 day + expire_in: 20m paths: - submission.jar grade: stage: grade - timeout: 15m + timeout: 10m except: - tags - master - - exercise-1 - - exercise-2 - - exercise-3 - - exercise-4 - - exercise-5 - - exercise-6 - - exercise-7 - - exercise-8 tags: - cs210 image: - name: lampepfl2022/cs206:grader-${CI_COMMIT_BRANCH} + name: ${DOCKER_REPO}/grader-${CI_COMMIT_BRANCH} entrypoint: [""] allow_failure: true before_script: @@ -65,4 +49,4 @@ grade: - cp submission.jar /shared/submission/submission.jar script: - cd /grader - - /grader/grade + - env -i bash --noprofile --norc -c "/grader/grade ch.epfl.lamp.grading.CourseraGrading -" -- GitLab