From 4cc4ade1128b8695bea1136cad6fd199056e312e Mon Sep 17 00:00:00 2001
From: mdales <mdales@ippon.fr>
Date: Wed, 6 Oct 2021 09:16:23 +0200
Subject: [PATCH] to remove
---
.gitlab-ci.yml | 38 --------------------------------------
.gitlab-common-ci.yml | 6 +++---
2 files changed, 3 insertions(+), 41 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dd665353..f17952af 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,42 +3,4 @@ stages:
include:
- local: "/.gitlab-common-ci.yml"
- - local: "/.gitlab-common-node-ci.yml"
- - local: "/word-wrap/.gitlab-ci.yml"
- - local: "/roman-numerals/.gitlab-ci.yml"
- - local: "/string-calculator/.gitlab-ci.yml"
- - local: "/gilded-rose/.gitlab-ci.yml"
- - local: "/ugly-trivia/.gitlab-ci.yml"
- - local: "/borestop/.gitlab-ci.yml"
- local: "/java-pagination-seven/.gitlab-ci.yml"
- - local: "/a-brief-history-of-date/.gitlab-ci.yml"
- - local: "/mustache-replacer/.gitlab-ci.yml"
- - local: "/string-calculator-2/.gitlab-ci.yml"
- - local: "/trip-service-kata/.gitlab-ci.yml"
- - local: "/tcr-roman-numerals/.gitlab-ci.yml"
- - local: "/java-h2g2/.gitlab-ci.yml"
- - local: "/factory-patterns/.gitlab-ci.yml"
- - local: "/exceptions/.gitlab-ci.yml"
- - local: "/puissance-4/.gitlab-ci.yml"
- - local: "/trip-service-kata-typescript/.gitlab-ci.yml"
- - local: "/roman-calculator/.gitlab-ci.yml"
- - local: "/h2g2/.gitlab-ci.yml"
- - local: "/java-streams/.gitlab-ci.yml"
- - local: "/game-of-life/.gitlab-ci.yml"
- - local: "/movie-rental/.gitlab-ci.yml"
- - local: "/fizz-buzz/.gitlab-ci.yml"
- - local: "/leap-years/.gitlab-ci.yml"
- - local: "/employee-report/.gitlab-ci.yml"
- - local: "/java-concurrence/.gitlab-ci.yml"
- - local: "/tennis/refactoring/.gitlab-ci.yml"
- - local: "/bowling-game/.gitlab-ci.yml"
- - local: "/tennis/greenfield-2/.gitlab-ci.yml"
- - local: "/mastermind/.gitlab-ci.yml"
- - local: "/try-monade/.gitlab-ci.yml"
- - local: "/java-puzzles/.gitlab-ci.yml"
- - local: "/java-monades/.gitlab-ci.yml"
- - local: "/java-diamond/.gitlab-ci.yml"
- - local: "/diamond-ts/.gitlab-ci.yml"
- - local: "/java-memoizers/.gitlab-ci.yml"
- - local: "/markov-chain/.gitlab-ci.yml"
- - local: "/names/.gitlab-ci.yml"
diff --git a/.gitlab-common-ci.yml b/.gitlab-common-ci.yml
index b5dc8b7e..a0852e67 100644
--- a/.gitlab-common-ci.yml
+++ b/.gitlab-common-ci.yml
@@ -1,8 +1,7 @@
variables:
MAVEN_OPTS: "-Dhttps.protocols=TLSv1.2 -Dmaven.repo.local=$CI_PROJECT_DIR/.m2/repository -Dorg.slf4j.simpleLogger.showDateTime=true -Djava.awt.headless=true"
MAVEN_CLI_OPTS: "--batch-mode --errors --fail-at-end --show-version -DinstallAtEnd=true -DdeployAtEnd=true"
- DOCKER_AUTH_CONFIG: '{ "auths": "docker-io-remote.artifactory.ippon.fr": { "auth": "Y2xvdWQtY2hhbGxlbmdlOkpAN2NmcFlYZ2V0R2RMaGo=" } } }'
- DOCKER_OPTS: " --insecure-registry docker-io-remote.artifactory.ippon.fr"
+ DOCKER_OPTS: " --insecure-registry $DOCKER_REGISTRY"
cache:
paths:
@@ -12,11 +11,12 @@ stages:
- build
.java-parent:
- image: docker-io-remote.artifactory.ippon.fr/maven:3.8.1-openjdk-16-slim
+ image: $DOCKER_REGISTRY/maven:3.8.1-openjdk-16-slim
stage: build
tags:
- docker
before_script:
+ - echo $DOCKER_AUTH_CONFIG
- cd $PROJECT_FOLDER
.java-no-jacoco:
--
GitLab