diff --git a/Jenkinsfile b/Jenkinsfile index 8ea42ef83fe8a59ed21750ea069225aaed1e637c..866994971e48dd4e8637ba8ec298fe498f8d0daa 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -35,6 +35,26 @@ pipeline { } } + stage('deploy intelliform-adapter'){ + when { + anyOf { + branch 'master' + branch 'release' + branch 'nexus' + } + } + steps { + script { + FAILED_STAGE = env.STAGE_NAME + } + container('maven') { + configFileProvider([configFile(fileId: '9aac2fac-7d8d-4128-846b-0a61951df703', variable: 'MAVEN_SETTINGS')]) { + sh 'mvn -s $MAVEN_SETTINGS -DskipTests deploy' + } + } + } + } + stage('openshift deploy') { steps { script { diff --git a/pom.xml b/pom.xml index f57ee6ef85e412860e51a6e1305b340755bf0ade..22ce014fb1230490b8f38f31fb783a61bda5cc34 100644 --- a/pom.xml +++ b/pom.xml @@ -163,44 +163,6 @@ </configuration> </plugin> - <plugin> - <groupId>com.spotify</groupId> - <artifactId>dockerfile-maven-plugin</artifactId> - <version>1.4.13</version> - <configuration> - <username>admin</username> - <password>admin</password> - <!-- <username>srv-schiffsregister-jenkins</username> --> - <!-- <password>Dataport2018!</password> --> - <!-- <repository>build.schir:8082/schir-docker/schir</repository> --> - <repository>default-route-openshift-image-registry.apps.lab.okd.local/sh-eingang-dev/if-adapter</repository> - <!-- <repository>artefactrepo-ccse.dataport.de/schiffsregister-docker-development</repository> --> - <tag>${git.branch}-${project.version}</tag> - <useMavenSettingsForAuth>true</useMavenSettingsForAuth> - <buildArgs> - <JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE> - </buildArgs> - </configuration> - <executions> - <execution> - <id>default</id> - <phase>deploy</phase> - <goals> - <goal>build</goal> - <goal>tag</goal> - <goal>push</goal> - </goals> - </execution> - </executions> - <dependencies> - <dependency> - <groupId>javax.activation</groupId> - <artifactId>activation</artifactId> - <version>1.1.1</version> - </dependency> - </dependencies> - </plugin> - <plugin> <groupId>pl.project13.maven</groupId> <artifactId>git-commit-id-plugin</artifactId> @@ -246,4 +208,67 @@ </plugins> </build> + <repositories> + <repository> + <id>ozg-nexus</id> + <name>ozg nexus</name> + <url>https://nexus.ozg-sh.de/repository/ozg-group/</url> + </repository> + </repositories> + + <distributionManagement> + <repository> + <id>ozg-nexus</id> + <name>ozg-releases</name> + <url>https://nexus.ozg-sh.de/repository/ozg-releases/</url> + </repository> + <snapshotRepository> + <id>ozg-nexus</id> + <name>ozg-snapshots</name> + <url>https://nexus.ozg-sh.de/repository/ozg-snapshots/</url> + </snapshotRepository> + </distributionManagement> + + <profiles> + <profile> + <id>docker-build</id> + <build> + <plugins> + <plugin> + <groupId>com.spotify</groupId> + <artifactId>dockerfile-maven-plugin</artifactId> + <version>1.4.13</version> + <configuration> + <username>admin</username> + <password>admin</password> + <repository>default-route-openshift-image-registry.apps.lab.okd.local/sh-eingang-dev/if-adapter</repository> + <tag>${git.branch}-${project.version}</tag> + <useMavenSettingsForAuth>true</useMavenSettingsForAuth> + <buildArgs> + <JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE> + </buildArgs> + </configuration> + <executions> + <execution> + <id>default</id> + <phase>deploy</phase> + <goals> + <goal>build</goal> + <goal>tag</goal> + <goal>push</goal> + </goals> + </execution> + </executions> + <dependencies> + <dependency> + <groupId>javax.activation</groupId> + <artifactId>activation</artifactId> + <version>1.1.1</version> + </dependency> + </dependencies> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project>