Commit 9f42bba7 authored by niklas.baumgarten's avatar niklas.baumgarten
Browse files

Merge branch 'new-registry' into 'feature'

updated to new registry

See merge request !58
parents e269cd8f 36a2a875
Pipeline #169253 passed with stages
in 24 minutes and 35 seconds
......@@ -8,7 +8,6 @@ stages:
variables:
OS: "ubuntu"
OS_VERSION_MLUQ: "20.04"
REGISTRY: "ci.cluster.math.kit.edu"
IMAGE_NAME_MLUQ: "mluq-${CI_COMMIT_SHORT_SHA}-${OS}${OS_VERSION_MLUQ}-${CI_PIPELINE_ID}"
RUN_EXPERIMENTS: 'none'
HOST: 'horeka'
......@@ -28,17 +27,18 @@ build-mluq:
only:
variables: [ $RUN_EXPERIMENTS == 'none' ]
before_script:
- docker info
- docker info
- docker login -u $MPP_REGISTRY_USER -p $MPP_REGISTRY_PASS ${MPP_REGISTRY}
script:
- sed s/REGISTRY/${REGISTRY}/g docker/mluq.baseimage >
- sed s/REGISTRY/${MPP_REGISTRY}\\/${MPP_REGISTRY_REPO_RELEASE}/g docker/mluq.baseimage >
docker/mluq_registry.baseimage
- sed s/UBUNTUVERSION/${OS_VERSION_MLUQ}/g docker/mluq_registry.baseimage >
docker/${IMAGE_NAME_MLUQ}.baseimage
- docker build
--build-arg UPSTREAM_COMMIT=${UPSTREAM_COMMIT}
--no-cache -t ${REGISTRY}/${IMAGE_NAME_MLUQ}
--no-cache -t ${MPP_REGISTRY}/${MPP_REGISTRY_REPO_DEV}/${IMAGE_NAME_MLUQ}
-f docker/${IMAGE_NAME_MLUQ}.baseimage .
- docker push ${REGISTRY}/${IMAGE_NAME_MLUQ}
- docker push ${MPP_REGISTRY}/${MPP_REGISTRY_REPO_DEV}/${IMAGE_NAME_MLUQ}
dependencies: [ ]
tags: [ docker ]
......@@ -49,7 +49,7 @@ ctest-mluq:
GIT_STRATEGY: none
only:
variables: [ $RUN_EXPERIMENTS == 'none' ]
image: ${REGISTRY}/${IMAGE_NAME_MLUQ}
image: ${MPP_REGISTRY}/${MPP_REGISTRY_REPO_DEV}/${IMAGE_NAME_MLUQ}
script:
- cd /mpp/build/
- ctest
......@@ -63,7 +63,7 @@ mpitest-1-mluq:
GIT_STRATEGY: none
only:
variables: [ $RUN_EXPERIMENTS == 'none' ]
image: ${REGISTRY}/${IMAGE_NAME_MLUQ}
image: ${MPP_REGISTRY}/${MPP_REGISTRY_REPO_DEV}/${IMAGE_NAME_MLUQ}
script:
- cd /mpp/build/
- python3 mppyrun.py -n 1 --mpi_tests=1 --mute=1
......@@ -77,7 +77,7 @@ mpitest-2-mluq:
GIT_STRATEGY: none
only:
variables: [ $RUN_EXPERIMENTS == 'none' ]
image: ${REGISTRY}/${IMAGE_NAME_MLUQ}
image: ${MPP_REGISTRY}/${MPP_REGISTRY_REPO_DEV}/${IMAGE_NAME_MLUQ}
script:
- cd /mpp/build/
- python3 mppyrun.py -n 2 --mpi_tests=1 --mute=1
......@@ -91,7 +91,7 @@ mpitest-4-mluq:
GIT_STRATEGY: none
only:
variables: [ $RUN_EXPERIMENTS == 'none' ]
image: ${REGISTRY}/${IMAGE_NAME_MLUQ}
image: ${MPP_REGISTRY}/${MPP_REGISTRY_REPO_DEV}/${IMAGE_NAME_MLUQ}
script:
- cd /mpp/build/
- python3 mppyrun.py -n 4 --mpi_tests=1 --mute=1
......@@ -105,7 +105,7 @@ mpitest-8-mluq:
GIT_STRATEGY: none
only:
variables: [ $RUN_EXPERIMENTS == 'none' ]
image: ${REGISTRY}/${IMAGE_NAME_MLUQ}
image: ${MPP_REGISTRY}/${MPP_REGISTRY_REPO_DEV}/${IMAGE_NAME_MLUQ}
script:
- cd /mpp/build/
- python3 mppyrun.py -n 8 --mpi_tests=1 --mute=1
......@@ -118,11 +118,13 @@ deploy-mluq:
variables:
GIT_STRATEGY: none
image: docker:latest
before_script:
- docker login -u $MPP_REGISTRY_USER -p $MPP_REGISTRY_PASS ${MPP_REGISTRY}
script:
- docker pull ${REGISTRY}/${IMAGE_NAME_MLUQ}
- docker tag ${REGISTRY}/${IMAGE_NAME_MLUQ}
${REGISTRY}/mluq-${CI_COMMIT_TAG}-${OS}${OS_VERSION_MLUQ}
- docker push ${REGISTRY}/mluq-${CI_COMMIT_TAG}-${OS}${OS_VERSION_MLUQ}
- docker pull ${MPP_REGISTRY}/${MPP_REGISTRY_REPO_DEV}/${IMAGE_NAME_MLUQ}
- docker tag ${MPP_REGISTRY}/${MPP_REGISTRY_REPO_DEV}/${IMAGE_NAME_MLUQ}
${MPP_REGISTRY}/${MPP_REGISTRY_REPO_RELEASE}/mluq-${OS}${OS_VERSION_MLUQ}:${CI_COMMIT_TAG}
- docker push ${MPP_REGISTRY}/${MPP_REGISTRY_REPO_RELEASE}/mluq-${OS}${OS_VERSION_MLUQ}:${CI_COMMIT_TAG}
only: [ tags ]
dependencies: [ "ctest-mluq", "mpitest-1-mluq", "mpitest-2-mluq",
"mpitest-4-mluq", "mpitest-8-mluq"]
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment