From 0b44191a4670cdeaf367b4b51d1bd677e7767a4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Corn=C3=A9=20Lukken?= <lukken@astron.nl>
Date: Thu, 25 Nov 2021 13:23:15 +0000
Subject: [PATCH] Combine previous and current .gitlab-ci.yml
---
.gitlab-ci.yml | 33 +++++++++++++++++++++++++++------
1 file changed, 27 insertions(+), 6 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 40daa8d0..01b78664 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,31 @@
stages:
- - run-opc-ua-test
-
-
+ - image
+ - run-opc-ua-test
+docker-build:
+ stage: image
+ image: docker:latest
+ tags:
+ - privileged
+ only:
+ refs:
+ - master
+ services:
+ - docker:dind
+ variables:
+ DOCKER_TLS_CERTDIR: "/certs"
+ before_script:
+ - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
+ script:
+ - |
+ if [[ "$CI_COMMIT_BRANCH" == "$CI_DEFAULT_BRANCH" ]]; then
+ tag=""
+ echo "Running on default branch '$CI_DEFAULT_BRANCH': tag = 'latest'"
+ else
+ tag=":$CI_COMMIT_REF_SLUG"
+ echo "Running on branch '$CI_COMMIT_BRANCH': tag = $tag"
+ fi
+ - docker build --pull -t "$CI_REGISTRY_IMAGE${tag}" .
+ - docker push "$CI_REGISTRY_IMAGE${tag}"
run-opc-ua-test:
tags:
- sdptr
@@ -10,6 +34,3 @@ run-opc-ua-test:
- echo "Running OPC UA tests"
- sleep 60
- echo "Done"
-
-
-
--
GitLab