diff --git a/Jenkinsfile b/Jenkinsfile index 54ab5dde04f97ca2c0911ba2f940ed49b3916525..99d815f0b488ddf77dada784978625f08647445a 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') } } }