Merge branch 'cherry-pick-5e898f7e' into 'master_7.1.x'

CP V7.1 - Bug #14150: add metadata-collect and workspace-collect to vitam containers build Merge branch...

Bug #14150: add metadata-collect and workspace-collect to vitam containers build

See merge request vitam/vitam!10451

(cherry picked from commit 5e898f7)

1a3bfa3 Bug #14150: add metadata-collect and workspace-collect to vitam containers build

Co-authored-by: Mohamed Achoubie <mohamed.achoubie.ext@culture.gouv.fr>

See merge request vitam/vitam!10465

Author: achoubiemohamed

Jenkinsfile.containers

@@ -40,20 +40,6 @@ pipeline {
                     '''
 
                     sh '$MVN_COMMAND -f sources/pom.xml install  -Djib.skip=false -Dmaven.test.skip=true -DskipTests=true -Djacoco.skip=true -Dlicense.skip -Denv.SERVICE_NEXUS_URL=$SERVICE_NEXUS_URL -DsendCredentialsOverHttp=true -Djib.to.auth.username=$CI_USR -Djib.to.auth.password=$CI_PSW'
-
-                    withCredentials([
-                    [$class: 'UsernamePasswordMultiBinding', credentialsId: 'app-jenkins',usernameVariable: 'CI_USR', passwordVariable: 'CI_PSW'],
-                    string(credentialsId: "service-nexus-url", variable: 'SERVICE_NEXUS_URL')
-                    ]) {
-                        sh 'echo $CI_PSW | docker login  ${SERVICE_DOCKER_PULL_URL} -u $CI_USR --password-stdin'
-                        sh 'echo $CI_PSW | docker login  ${SERVICE_DOCKER_PUSH_URL} -u $CI_USR --password-stdin'
-                        sh "docker pull ${SERVICE_DOCKER_PUSH_URL}/vitam/metadata"
-                        sh "docker tag ${SERVICE_DOCKER_PUSH_URL}/vitam/metadata ${SERVICE_DOCKER_PUSH_URL}/vitam/metadata-collect"
-                        sh "docker push ${SERVICE_DOCKER_PUSH_URL}/vitam/metadata-collect"
-                        sh "docker pull ${SERVICE_DOCKER_PUSH_URL}/vitam/workspace"
-                        sh "docker tag ${SERVICE_DOCKER_PUSH_URL}/vitam/workspace ${SERVICE_DOCKER_PUSH_URL}/vitam/workspace-collect"
-                        sh "docker push ${SERVICE_DOCKER_PUSH_URL}/vitam/workspace-collect"
-                    }
                 }
             }
         }

sources/metadata/metadata-rest/pom.xml

@@ -97,6 +97,7 @@
 				<configuration>
 					<to>
 						<image>${env.SERVICE_DOCKER_PUSH_URL}/vitam/metadata</image>
+						<image>${env.SERVICE_DOCKER_PUSH_URL}/vitam/metadata-collect</image>
 						<tags>
 							<tag>${git.commit.id.describe-short}</tag>
 							<tag>${project.version}</tag>

sources/workspace/workspace-rest/pom.xml

@@ -62,6 +62,7 @@
 				<configuration>
 					<to>
 						<image>${env.SERVICE_DOCKER_PUSH_URL}/vitam/workspace</image>
+						<image>${env.SERVICE_DOCKER_PUSH_URL}/vitam/workspace-collect</image>
 						<tags>
 							<tag>${git.commit.id.describe-short}</tag>
 							<tag>${project.version}</tag>