From 2a02229770c0fa9a039fc75ecd7261a8ca5f64ed Mon Sep 17 00:00:00 2001 From: Petros Savvidis Date: Thu, 31 Oct 2024 12:06:03 +0200 Subject: [PATCH] Execute maven or maven and postgres pods --- .ci/config/stage-types.yaml | 8 ++++---- .ci/daily/Jenkinsfile | 6 +++--- Jenkinsfile | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.ci/config/stage-types.yaml b/.ci/config/stage-types.yaml index de987da3473..dff02a07ac3 100644 --- a/.ci/config/stage-types.yaml +++ b/.ci/config/stage-types.yaml @@ -34,7 +34,7 @@ db-unit: - 'postgresql' podSpec: cpu: 4 - image: 'maven:3.8.5-eclipse-temurin-11' + images: ['maven:3.8.5-eclipse-temurin-11', 'postgres:17.0'] sql-scripts: directory: 'distro/sql-script' command: 'install -Pcheck-sql,' @@ -141,7 +141,7 @@ platform-jdk-temurin-jdk-17-latest: jdkVersion: 'jdk-17-latest' podSpec: cpu: 4 - image: 'maven:3.9.7-eclipse-temurin-17' + images: ['maven:3.9.7-eclipse-temurin-17'] platform-jdk-temurin-jdk-21-latest: directory: '.' command: 'install source:jar source:test-jar -Pdistro,distro-ce,distro-wildfly' @@ -151,7 +151,7 @@ platform-jdk-temurin-jdk-21-latest: jdkVersion: 'jdk-21-latest' podSpec: cpu: 4 - image: 'maven:3.9.7-eclipse-temurin-21' + images: ['maven:3.9.7-eclipse-temurin-21'] platform-jdk-temurin-jdk-11-latest: directory: '.' command: 'install source:jar source:test-jar @@ -174,7 +174,7 @@ platform-jdk-temurin-jdk-11-latest: jdkVersion: 'jdk-11-latest' podSpec: cpu: 4 - image: 'maven:3.9.7-eclipse-temurin-11' + images: ['maven:3.9.7-eclipse-temurin-11'] platform-jdk-jdk-17-latest: directory: '.' command: 'install source:jar source:test-jar -Pdistro,distro-ce,distro-wildfly -Dskip.frontend.build=true' diff --git a/.ci/daily/Jenkinsfile b/.ci/daily/Jenkinsfile index 03a89d710b4..bad246f5dc0 100644 --- a/.ci/daily/Jenkinsfile +++ b/.ci/daily/Jenkinsfile @@ -95,7 +95,7 @@ pipeline { cambpmConditionalRetry([ podSpec: [ cpu: 4, - image: 'alpine:3.20' + images: ['alpine:3.20'] ], runSteps : { sh "apk -U add openjdk17-jdk maven rsync openssh libstdc++ libgcc bash" @@ -158,7 +158,7 @@ pipeline { cambpmConditionalRetry([ podSpec: [ cpu: 32, - image: 'maven:3.9.7-eclipse-temurin-17' + images: ['maven:3.9.7-eclipse-temurin-17'] ], runSteps: { cambpmRunMaven('.', @@ -192,7 +192,7 @@ pipeline { cambpmConditionalRetry([ podSpec: [ cpu: 32, - image: 'maven:3.9.7-eclipse-temurin-17' + images: ['maven:3.9.7-eclipse-temurin-17'] ], runSteps: { cambpmRunMaven('.', diff --git a/Jenkinsfile b/Jenkinsfile index eb58fb0ea56..b9fd038b3ba 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -38,7 +38,7 @@ pipeline { cambpmConditionalRetry([ podSpec: [ cpu: 32, - image: 'maven:3.9.7-eclipse-temurin-17' + images: ['maven:3.9.7-eclipse-temurin-17'] ], suppressErrors: false, runSteps: {