From b09f45f7f13e7760aefc61d2e749f0c71e285e09 Mon Sep 17 00:00:00 2001
From: Konrad Botor <kbotor@syncad.com>
Date: Wed, 18 Oct 2023 12:59:02 +0200
Subject: [PATCH] Made jobs interruptible by default - ref. #4
---
templates/base.gitlab-ci.yml | 1 +
templates/docker_image_jobs.gitlab-ci.yml | 2 --
templates/python_projects.gitlab-ci.yml | 1 -
templates/test_jobs.gitlab-ci.yml | 1 -
templates/wasm_build.gitlab-ci.yml | 1 -
5 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/templates/base.gitlab-ci.yml b/templates/base.gitlab-ci.yml
index e91c776..d8b129a 100644
--- a/templates/base.gitlab-ci.yml
+++ b/templates/base.gitlab-ci.yml
@@ -1,4 +1,5 @@
default:
+ interruptible: true
timeout: 1 hour
artifacts:
when: always
diff --git a/templates/docker_image_jobs.gitlab-ci.yml b/templates/docker_image_jobs.gitlab-ci.yml
index 5193e16..c7c56ed 100644
--- a/templates/docker_image_jobs.gitlab-ci.yml
+++ b/templates/docker_image_jobs.gitlab-ci.yml
@@ -12,7 +12,6 @@ include:
DOCKER_DRIVER: overlay2
DOCKER_TLS_CERTDIR: "/certs"
image: registry.gitlab.syncad.com/hive/common-ci-configuration/docker-builder:${DOCKER_BUILDER_TAG}
- interruptible: true
before_script:
- |
echo -e "\e[0Ksection_start:$(date +%s):buildkit_config[collapsed=true]\r\e[0KConfiguring Docker BuildKit..."
@@ -26,7 +25,6 @@ include:
.docker_image_cleanup_job_template:
extends: .job-defaults
image: registry.gitlab.syncad.com/hive/common-ci-configuration/image-remover:${IMAGE_REMOVER_TAG}
- interruptible: true
variables:
REGISTRY: $CI_REGISTRY_IMAGE
REGISTRY_PASS: ""
diff --git a/templates/python_projects.gitlab-ci.yml b/templates/python_projects.gitlab-ci.yml
index 0481482..2b4d396 100644
--- a/templates/python_projects.gitlab-ci.yml
+++ b/templates/python_projects.gitlab-ci.yml
@@ -18,7 +18,6 @@ variables:
.configuration_template:
image: "${PYTHON_IMAGE}"
- interruptible: true
before_script:
- poetry env use python3 # create virtualenv if not exists
- source $(poetry env info --path)/bin/activate # activate that virtualenv
diff --git a/templates/test_jobs.gitlab-ci.yml b/templates/test_jobs.gitlab-ci.yml
index 17bdbb1..6e9c1e8 100644
--- a/templates/test_jobs.gitlab-ci.yml
+++ b/templates/test_jobs.gitlab-ci.yml
@@ -33,7 +33,6 @@ include:
JUNIT_REPORT: "report.xml" # should be ovverided by derived jobs
PYTEST_BASED_IMAGE_NAME: "" # "$CI_REGISTRY_IMAGE/ci-base-image$TEST_IMAGE_TAG"
POETRY_INSTALL_ROOT_DIR: "" # $CI_PROJECT_DIR/tests/hive-local-tools
- interruptible: true
image: "${PYTEST_BASED_IMAGE_NAME}"
before_script:
diff --git a/templates/wasm_build.gitlab-ci.yml b/templates/wasm_build.gitlab-ci.yml
index 7fd34ea..c3c62cd 100644
--- a/templates/wasm_build.gitlab-ci.yml
+++ b/templates/wasm_build.gitlab-ci.yml
@@ -8,7 +8,6 @@ variables:
.wasm_build_job_template:
extends: .job-defaults
- interruptible: true
variables:
# The directory containing sources to be built - it should be overrided by derived job
SOURCE_DIR: ""
--
GitLab