From 8f1bdc4c2d69f054e311a6b57f9fa00764faefd3 Mon Sep 17 00:00:00 2001 From: OZGCloud <ozgcloud@mgm-tp.com> Date: Wed, 8 Feb 2023 14:14:19 +0100 Subject: [PATCH] OZG-3369 jenkins docker builds for formcycle-adapter --- Jenkinsfile | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 54ab5dde0..99d815f0b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -39,17 +39,20 @@ pipeline { def fsAdapterPom = readMavenPom file: 'formsolutions-adapter/pom.xml' def fsAdapterVersion = fsAdapterPom.parent.version + def formCycleAdapterPom = readMavenPom file: 'formcycle-adapter/pom.xml' + def formCycleAdapterVersion = formCycleAdapterPom.parent.version + if(env.BRANCH_NAME == 'release'){ - if ( !(rootVersion ==~ RELEASE_REGEX) || !(plutoVersion ==~ RELEASE_REGEX) || !(commonVersion ==~ RELEASE_REGEX) || !(routerVersion ==~ RELEASE_REGEX) || !(ifAdapterVersion ==~ RELEASE_REGEX) || !(fsAdapterVersion ==~ RELEASE_REGEX)) { + if ( !(rootVersion ==~ RELEASE_REGEX) || !(plutoVersion ==~ RELEASE_REGEX) || !(commonVersion ==~ RELEASE_REGEX) || !(routerVersion ==~ RELEASE_REGEX) || !(ifAdapterVersion ==~ RELEASE_REGEX) || !(fsAdapterVersion ==~ RELEASE_REGEX) || !(formCycleAdapterVersion ==~ RELEASE_REGEX)) { error("Keine Release Version für Branch ${env.BRANCH_NAME}.") } } else { - if ( !(rootVersion ==~ SNAPSHOT_REGEX) || !(routerVersion ==~ SNAPSHOT_REGEX) || !(ifAdapterVersion ==~ SNAPSHOT_REGEX) || !(fsAdapterVersion ==~ SNAPSHOT_REGEX)) { + if ( !(rootVersion ==~ SNAPSHOT_REGEX) || !(routerVersion ==~ SNAPSHOT_REGEX) || !(ifAdapterVersion ==~ SNAPSHOT_REGEX) || !(fsAdapterVersion ==~ SNAPSHOT_REGEX) || !(formCycleAdapterVersion ==~ SNAPSHOT_REGEX)) { error("Keine Snapshot Version für Branch ${env.BRANCH_NAME}.") } } - if( !(rootVersion == commonVersion && rootVersion == routerVersion && rootVersion == ifAdapterVersion && rootVersion == fsAdapterVersion)){ + if( !(rootVersion == commonVersion && rootVersion == routerVersion && rootVersion == ifAdapterVersion && rootVersion == fsAdapterVersion && rootVersion == formCycleAdapterVersion)){ error("Versionen sind nicht identisch") } } @@ -109,14 +112,17 @@ pipeline { tagAndPushDockerImage('intelliform-adapter', IMAGE_TAG) tagAndPushDockerImage('formsolutions-adapter', IMAGE_TAG) + tagAndPushDockerImage('formcycle-adapter', IMAGE_TAG) if (env.BRANCH_NAME == 'master') { tagAndPushDockerImage('intelliform-adapter', 'snapshot-latest') tagAndPushDockerImage('formsolutions-adapter', 'snapshot-latest') + tagAndPushDockerImage('formcycle-adapter', 'snapshot-latest') } else if (env.BRANCH_NAME == 'release') { tagAndPushDockerImage('intelliform-adapter', 'latest') tagAndPushDockerImage('formsolutions-adapter', 'latest') + tagAndPushDockerImage('formcycle-adapter', 'latest') } } } -- GitLab