diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e0c1671ec5d67d3cd2100d100c5fb0d74ff2ec80..d4cf8ae023202546dd1fc09f38341a54ce557aeb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -320,6 +320,10 @@ integration_test_docker: script: # Do not remove 'bash' or statement will be ignored by primitive docker shell - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh pull $tag + # re-tag alpine image from our registry to trick nomad in using it + - docker tag git.astron.nl:5000/lofar2.0/tango/alpine:latest alpine:latest + - docker pull git.astron.nl:5000/lofar2.0/tango/docker-registry-proxy:0.6.3 + - docker tag git.astron.nl:5000/lofar2.0/tango/docker-registry-proxy:0.6.3 docker-registry-proxy:0.6.3 # Do not remove 'bash' or statement will be ignored by primitive docker shell - bash -e $CI_PROJECT_DIR/sbin/run_integration_test.sh --no-build --save-logs diff --git a/docker-compose/object-storage.yml b/docker-compose/object-storage.yml index 434faf6588729f46c662bac42bbb9a77ca6f3184..4fc5f038b19a6c775866cbb167cc3139295b509d 100644 --- a/docker-compose/object-storage.yml +++ b/docker-compose/object-storage.yml @@ -11,7 +11,7 @@ version: '2.1' services: # the object storage is started by nomad/jumppad. This only populates the data for the integration tests init-object-storage: - image: minio/mc:${MINIO_CLIENT_VERSION} + image: ${LOCAL_DOCKER_REGISTRY_HOST}/${LOCAL_DOCKER_REGISTRY_USER}/mc:${MINIO_CLIENT_VERSION} networks: - control dns: ${DNS} diff --git a/infra/dev/nomad/nomad.hcl b/infra/dev/nomad/nomad.hcl index 214e22257b1abf3e3f23598878f1cde92d75bae0..7cf12773d046c8ea159d66f9bbe54bde992746e0 100644 --- a/infra/dev/nomad/nomad.hcl +++ b/infra/dev/nomad/nomad.hcl @@ -97,6 +97,10 @@ resource "nomad_cluster" "station" { NO_PROXY = "git.astron.nl:5000" } + image { + name = "git.astron.nl:5000/lofar2.0/tango/nomad:1.6.1" + } + volume { source = "${variable.host_volume}" destination = "/localdata" diff --git a/sbin/tag_and_push_docker_image.sh b/sbin/tag_and_push_docker_image.sh index 83fc8543ade99ccc335e0113f22c37825e9f8795..c3750ebed440363dcc8f733be4c71b8942b24eba 100755 --- a/sbin/tag_and_push_docker_image.sh +++ b/sbin/tag_and_push_docker_image.sh @@ -78,8 +78,12 @@ REMOTE_IMAGES=( "levant latest hashicorp" "consul latest hashicorp" "minio ${MINIO_VERSION} minio" + "mc ${MINIO_CLIENT_VERSION} minio" "busybox latest" "bash latest" + "alpine latest" + "nomad 1.6.1 shipyardrun" + "docker-registry-proxy 0.6.3 shipyardrun" ) # Triple tuple of docker-compose names, image names and if necessary for @@ -99,6 +103,8 @@ LOCAL_IMAGES=( "jupyter-lab jupyter-lab n" "integration-test docker-compose_integration-test n" "tango-prometheus-exporter tango-prometheus-exporter n" + + "alpine alpine y" ) # LOCAL_IMAGES verifier, this has been going wrong a couple of times