Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
79 changes: 43 additions & 36 deletions Jenkinsfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
def mvnProfile = 'galasa-dev'
def mvnProfile = 'dev'
def galasaSignJarSkip = 'true'

pipeline {
Expand All @@ -23,22 +23,24 @@ pipeline {
}
steps {
script {
mvnGoal = 'deploy sonar:sonar'
mvnGoal = 'deploy sonar:sonar'
galasaSignJarSkip = 'false'
}
}
}
// If it is the master branch, version 0.3.0 and master on all the other branches
stage('set-staging') {
when {
environment name: 'GIT_BRANCH', value: 'origin/staging'
}
steps {
script {
mvnGoal = 'deploy'
mvnProfile = 'staging'
galasaSignJarSkip = 'false'
}
}
}
// If the test-preprod tag, then set as appropriate
// stage('set-test-preprod') {
// when {
// environment name: 'GIT_BRANCH', value: 'origin/testpreprod'
// }
// steps {
// script {
// mvnProfile = 'galasa-preprod'
// }
// }
// }

// for debugging purposes
stage('report') {
Expand Down Expand Up @@ -67,48 +69,53 @@ pipeline {

stage('SimPlatform Application') {
steps {
withSonarQubeEnv('GalasaSonarQube') {
dir('galasa-simplatform-application') {
sh "mvn --settings ${workspace}/settings.xml -Dmaven.repo.local=${workspace}/repository -P ${mvnProfile} -B -e -fae --non-recursive ${mvnGoal}"
withCredentials([string(credentialsId: 'galasa-gpg', variable: 'GPG')]) {
withSonarQubeEnv('GalasaSonarQube') {
dir('galasa-simplatform-application') {
sh "mvn --settings ${workspace}/settings.xml -Dmaven.repo.local=${workspace}/repository -Dgpg.skip=false -Dgpg.passphrase=$GPG -P ${mvnProfile} -B -e -fae --non-recursive ${mvnGoal}"
}
}
}
}
}
stage('SimBank-Tests') {
steps {
withSonarQubeEnv('GalasaSonarQube') {
dir('galasa-simbank-tests') {
sh "mvn --settings ${workspace}/settings.xml -Dmaven.repo.local=${workspace}/repository -P ${mvnProfile} -B -e -fae --non-recursive ${mvnGoal}"
withCredentials([string(credentialsId: 'galasa-gpg', variable: 'GPG')]) {
withSonarQubeEnv('GalasaSonarQube') {
dir('galasa-simbank-tests') {
sh "mvn --settings ${workspace}/settings.xml -Dmaven.repo.local=${workspace}/repository -Dgpg.skip=false -Dgpg.passphrase=$GPG -P ${mvnProfile} -B -e -fae --non-recursive ${mvnGoal}"

dir('dev.galasa.simbank.manager') {
sh "mvn --settings ${workspace}/settings.xml -Dmaven.repo.local=${workspace}/repository -P ${mvnProfile} -B -e -fae --non-recursive ${mvnGoal}"
}
dir('dev.galasa.simbank.manager') {
sh "mvn --settings ${workspace}/settings.xml -Dmaven.repo.local=${workspace}/repository -Dgpg.skip=false -Dgpg.passphrase=$GPG -P ${mvnProfile} -B -e -fae --non-recursive ${mvnGoal}"
}

dir('dev.galasa.simbank.tests') {
sh "mvn --settings ${workspace}/settings.xml -Dmaven.repo.local=${workspace}/repository -P ${mvnProfile} -B -e -fae --non-recursive ${mvnGoal}"
}
dir('dev.galasa.simbank.tests') {
sh "mvn --settings ${workspace}/settings.xml -Dmaven.repo.local=${workspace}/repository -Dgpg.skip=false -Dgpg.passphrase=$GPG -P ${mvnProfile} -B -e -fae --non-recursive ${mvnGoal}"
}

dir('dev.galasa.simbank.obr') {
sh "mvn --settings ${workspace}/settings.xml -Dmaven.repo.local=${workspace}/repository -P ${mvnProfile} -B -e -fae --non-recursive ${mvnGoal}"
dir('dev.galasa.simbank.obr') {
sh "mvn --settings ${workspace}/settings.xml -Dmaven.repo.local=${workspace}/repository -Dgpg.skip=false -Dgpg.passphrase=$GPG -P ${mvnProfile} -B -e -fae --non-recursive ${mvnGoal}"
}
}
}
}
}
}
stage('SimBank Eclipse Comms Maven') {
steps {
withSonarQubeEnv('GalasaSonarQube') {
dir('galasa-simbank-eclipse') {
sh "mvn --settings ${workspace}/settings.xml -Dmaven.repo.local=${workspace}/repository -P ${mvnProfile} -B -e -fae --non-recursive ${mvnGoal}"
withCredentials([string(credentialsId: 'galasa-gpg', variable: 'GPG')]) {
withSonarQubeEnv('GalasaSonarQube') {
dir('galasa-simbank-eclipse') {
sh "mvn --settings ${workspace}/settings.xml -Dmaven.repo.local=${workspace}/repository -Dgpg.skip=false -Dgpg.passphrase=$GPG -P ${mvnProfile} -B -e -fae --non-recursive ${mvnGoal}"

dir('dev.galasa.simbank.ui') {
sh "mvn --settings ${workspace}/settings.xml -Dmaven.repo.local=${workspace}/repository -Djarsigner.skip=${galasaSignJarSkip} -P ${mvnProfile} -B -e -fae --non-recursive ${mvnGoal}"
}
dir('dev.galasa.simbank.ui') {
sh "mvn --settings ${workspace}/settings.xml -Dmaven.repo.local=${workspace}/repository -Djarsigner.skip=${galasaSignJarSkip} -Dgpg.skip=false -Dgpg.passphrase=$GPG -P ${mvnProfile} -B -e -fae --non-recursive ${mvnGoal}"
}

dir('dev.galasa.simbank.feature') {
sh "mvn --settings ${workspace}/settings.xml -Dmaven.repo.local=${workspace}/repository -Djarsigner.skip=${galasaSignJarSkip} -P ${mvnProfile} -B -e -fae --non-recursive ${mvnGoal}"
dir('dev.galasa.simbank.feature') {
sh "mvn --settings ${workspace}/settings.xml -Dmaven.repo.local=${workspace}/repository -Djarsigner.skip=${galasaSignJarSkip} -Dgpg.skip=false -Dgpg.passphrase=$GPG -P ${mvnProfile} -B -e -fae --non-recursive ${mvnGoal}"
}
}

}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="dev.galasa.simbank.feature"
label="Galasa SimBank"
version="0.3.0.qualifier"
version="0.3.0"
provider-name="IBM">

<copyright>
Expand Down Expand Up @@ -296,4 +296,5 @@ version(s), and exceptions or additional permissions here}.&quot;
download-size="0"
install-size="0"
version="0.3.0.qualifier"/>

</feature>
4 changes: 2 additions & 2 deletions galasa-simbank-eclipse/dev.galasa.simbank.feature/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>dev.galasa</groupId>
<artifactId>galasa-simbank-eclipse</artifactId>
<version>0.3.0-SNAPSHOT</version>
<version>0.3.0</version>
</parent>


Expand All @@ -18,7 +18,7 @@
<dependency>
<groupId>dev.galasa</groupId>
<artifactId>dev.galasa.simbank.ui</artifactId>
<version>0.3.0-SNAPSHOT</version>
<version>0.3.0</version>
</dependency>
</dependencies>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Galasa SimBank
Bundle-SymbolicName: dev.galasa.simbank.ui;singleton:=true
Bundle-Version: 0.3.0.qualifier
Bundle-Version: 0.3.0
Automatic-Module-Name: dev.galasa.simbank.ui
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.eclipse.ui,
Expand Down
8 changes: 4 additions & 4 deletions galasa-simbank-eclipse/dev.galasa.simbank.ui/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
<parent>
<groupId>dev.galasa</groupId>
<artifactId>galasa-simbank-eclipse</artifactId>
<version>0.3.0-SNAPSHOT</version>
<version>0.3.0</version>
</parent>

<artifactId>dev.galasa.simbank.ui</artifactId>
<version>0.3.0-SNAPSHOT</version>
<version>0.3.0</version>
<packaging>eclipse-plugin</packaging>
<name>Galasa SimBank UI</name>

Expand All @@ -31,12 +31,12 @@
<item>
<groupId>dev.galasa</groupId>
<artifactId>galasa-simplatform</artifactId>
<version>0.3.0-SNAPSHOT</version>
<version>0.3.0</version>
</item>
<item>
<groupId>dev.galasa</groupId>
<artifactId>galasa-simbanktests-parent</artifactId>
<version>0.3.0-SNAPSHOT</version>
<version>0.3.0</version>
<classifier>examples</classifier>
<type>zip</type>
</item>
Expand Down
18 changes: 9 additions & 9 deletions galasa-simbank-eclipse/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,26 +6,26 @@
<parent>
<groupId>dev.galasa</groupId>
<artifactId>galasa-eclipse-parent</artifactId>
<version>0.3.0-SNAPSHOT</version>
<version>0.3.0</version>
</parent>

<artifactId>galasa-simbank-eclipse</artifactId>
<version>0.3.0-SNAPSHOT</version>
<version>0.3.0</version>
<packaging>pom</packaging>
<name>Galasa Simbank Eclipse Parent</name>

<modules>
<module>dev.galasa.simbank.ui</module>
<module>dev.galasa.simbank.feature</module>
</modules>

<dependencies>
<dependency>
<groupId>dev.galasa</groupId>
<artifactId>dev.galasa.eclipse</artifactId>
<version>0.3.0-SNAPSHOT</version>
<type>eclipse-plugin</type>
</dependency>
<dependency>
<groupId>dev.galasa</groupId>
<artifactId>dev.galasa.eclipse</artifactId>
<version>[0.3.0,1.0.0)</version>
<type>eclipse-plugin</type>
</dependency>
</dependencies>

</project>
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<dependency>
<groupId>dev.galasa</groupId>
<artifactId>galasa-bom</artifactId>
<version>0.3.0-SNAPSHOT</version>
<version>0.3.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
4 changes: 2 additions & 2 deletions galasa-simbank-tests/dev.galasa.simbank.manager/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
<parent>
<groupId>dev.galasa</groupId>
<artifactId>galasa-simbanktests-parent</artifactId>
<version>0.3.0-SNAPSHOT</version>
<version>0.3.0</version>
</parent>

<name>Galasa SimBank Manager</name>

<artifactId>dev.galasa.simbank.manager</artifactId>
<version>0.3.0-SNAPSHOT</version>
<version>0.3.0</version>
<packaging>bundle</packaging>

<dependencies>
Expand Down
8 changes: 4 additions & 4 deletions galasa-simbank-tests/dev.galasa.simbank.obr/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,26 +6,26 @@
<parent>
<groupId>dev.galasa</groupId>
<artifactId>galasa-simbanktests-parent</artifactId>
<version>0.3.0-SNAPSHOT</version>
<version>0.3.0</version>
</parent>

<name>Galasa SimBank OBR</name>

<artifactId>dev.galasa.simbank.obr</artifactId>
<version>0.3.0-SNAPSHOT</version>
<version>0.3.0</version>
<packaging>galasa-obr</packaging>

<dependencies>
<dependency>
<groupId>dev.galasa</groupId>
<artifactId>dev.galasa.simbank.tests</artifactId>
<version>0.3.0-SNAPSHOT</version>
<version>0.3.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>dev.galasa</groupId>
<artifactId>dev.galasa.simbank.manager</artifactId>
<version>0.3.0-SNAPSHOT</version>
<version>0.3.0</version>
<scope>compile</scope>
</dependency>
</dependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<dependency>
<groupId>dev.galasa</groupId>
<artifactId>galasa-bom</artifactId>
<version>0.3.0-SNAPSHOT</version>
<version>0.3.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
6 changes: 3 additions & 3 deletions galasa-simbank-tests/dev.galasa.simbank.tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,20 @@
<parent>
<groupId>dev.galasa</groupId>
<artifactId>galasa-simbanktests-parent</artifactId>
<version>0.3.0-SNAPSHOT</version>
<version>0.3.0</version>
</parent>

<name>Galasa SimBank Example Tests</name>

<artifactId>dev.galasa.simbank.tests</artifactId>
<version>0.3.0-SNAPSHOT</version>
<version>0.3.0</version>
<packaging>bundle</packaging>

<dependencies>
<dependency>
<groupId>dev.galasa</groupId>
<artifactId>dev.galasa.simbank.manager</artifactId>
<version>0.3.0-SNAPSHOT</version>
<version>0.3.0</version>
<scope>provided</scope>
</dependency>
</dependencies>
Expand Down
Loading