From fe240c82b47554e1fbe8b3dd54857e577aa543d3 Mon Sep 17 00:00:00 2001 From: sirkrypt0 <22522058+sirkrypt0@users.noreply.github.com> Date: Tue, 27 Jul 2021 15:45:56 +0200 Subject: [PATCH] Remove demo job HCL file Previously we used this file to deploy a job on Nomad that our API used for e2e tests. Now that we create the environments in the e2e tests, we don't need the demo job anymore. --- .gitlab-ci.yml | 4 -- deploy/demo-job.tpl.nomad | 77 --------------------------------------- 2 files changed, 81 deletions(-) delete mode 100644 deploy/demo-job.tpl.nomad diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d17e6e8..be1d5c1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -130,9 +130,6 @@ test_e2e: - export NOMAD_ADDR=http://localhost:4646 - nomad agent -dev -log-level=WARN & - sleep 5 - - export NOMAD_NAMESPACE="default" - - ./deploy/nomad-run-env-job.sh deploy/demo-job.tpl.nomad deploy/demo-job.nomad - - sleep 5 # Start Poseidon and wait for it - ./poseidon & - sleep 20 @@ -174,7 +171,6 @@ deploy_review: before_script: - export NOMAD_NAMESPACE="$NOMAD_SLUG" - nomad namespace apply $NOMAD_NAMESPACE - - ./deploy/nomad-run-env-job.sh deploy/demo-job.tpl.nomad deploy/demo-job.nomad only: - branches - tags diff --git a/deploy/demo-job.tpl.nomad b/deploy/demo-job.tpl.nomad deleted file mode 100644 index 9723bd2..0000000 --- a/deploy/demo-job.tpl.nomad +++ /dev/null @@ -1,77 +0,0 @@ -// This job is used by the e2e tests as a demo job. - -job "template-0" { - datacenters = ["dc1"] - type = "batch" - namespace = "${NOMAD_NAMESPACE}" - - group "default-group" { - ephemeral_disk { - migrate = false - size = 10 - sticky = false - } - count = 1 - scaling { - enabled = true - max = 300 - } - spread { - // see https://www.nomadproject.io/docs/job-specification/spread#even-spread-across-data-center - // This spreads the load evenly amongst our nodes - attribute = "${node.unique.name}" - weight = 100 - } - - task "default-task" { - driver = "docker" - kill_timeout = "0s" - kill_signal = "SIGKILL" - - config { - image = "openhpi/co_execenv_python:3.8" - command = "sleep" - args = ["infinity"] - } - - logs { - max_files = 1 - max_file_size = 1 - } - - resources { - cpu = 40 - memory = 40 - } - - restart { - delay = "0s" - } - } - } - group "config" { - // We want to store whether a task is in use in order to recover from a downtime. - // Without a separate config task, marking a task as used would result in a restart of that task, - // as the meta information is passed to the container as environment variables. - count = 0 - task "config" { - driver = "exec" - config { - command = "true" - } - logs { - max_files = 1 - max_file_size = 1 - } - resources { - // minimum values - cpu = 1 - memory = 10 - } - } - meta { - used = "false" - prewarmingPoolSize = "0" - } - } -}