Skip to content

Commit 27e5e0e

Browse files
authored
update Jenkinsfile - update rules based on branch names
* update parameter rules to work for naming convention in rspace-os project (main branch is 'main' now)
1 parent c1023b9 commit 27e5e0e

File tree

1 file changed

+3
-16
lines changed

1 file changed

+3
-16
lines changed

Jenkinsfile

+3-16
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ pipeline {
2626
booleanParam(name: 'AWS_DEPLOY_PROD_RELEASE', defaultValue: false, description: 'Deploy main branch build created in prodRelease mode to AWS')
2727
booleanParam(name: 'DOCKER_AWS_DEPLOY', defaultValue: false, description: 'Deploy branch build to Docker on AWS - see the README in build/ folder for more details')
2828
booleanParam(name: 'FRONTEND_TESTS', defaultValue: false, description: 'Run Flow/Jest tests (runs after changes to frontend files by default)')
29-
booleanParam(name: 'FULL_JAVA_TESTS', defaultValue: false, description: 'Run all Java tests (runs on master/develop by default)')
29+
booleanParam(name: 'FULL_JAVA_TESTS', defaultValue: false, description: 'Run all Java tests')
3030
booleanParam(name: 'LIQUIBASE', defaultValue: false, description: 'Run tests on persistent liquibaseTest database')
3131
}
3232

@@ -71,7 +71,6 @@ pipeline {
7171
when {
7272
not {
7373
anyOf {
74-
branch 'master'; branch 'develop'
7574
expression { return params.FULL_JAVA_TESTS }
7675
expression { return params.LIQUIBASE }
7776
}
@@ -175,7 +174,6 @@ pipeline {
175174
}
176175
not {
177176
anyOf {
178-
branch 'master'; branch 'develop'
179177
expression { return params.FULL_JAVA_TESTS }
180178
expression { return params.LIQUIBASE }
181179
expression { return params.AWS_DEPLOY_PROD_RELEASE }
@@ -237,11 +235,6 @@ pipeline {
237235
expression { return params.AWS_DEPLOY }
238236
expression { return params.AWS_DEPLOY_PROD_RELEASE }
239237
}
240-
not {
241-
anyOf {
242-
branch 'master'; branch 'develop'
243-
}
244-
}
245238
}
246239

247240
steps {
@@ -276,11 +269,6 @@ pipeline {
276269
stage('Deploy package to Docker on AWS') {
277270
when {
278271
expression { return params.DOCKER_AWS_DEPLOY }
279-
not {
280-
anyOf {
281-
branch 'master'; branch 'develop'
282-
}
283-
}
284272
}
285273
steps {
286274
dir('./build/packer/web') {
@@ -337,10 +325,10 @@ pipeline {
337325
stage('Liquibase tests') {
338326
when {
339327
expression { return params.LIQUIBASE }
340-
branch 'develop'
328+
branch 'main'
341329
}
342330
steps {
343-
echo 'Running liquibase tests on develop branch...'
331+
echo 'Running liquibase tests on main branch...'
344332
sh "./mvnw -e clean test -PtestLiquibase -Djava-version=${params.MAVEN_TOOLCHAIN_JAVA_VERSION} \
345333
-Djava-vendor=${params.MAVEN_TOOLCHAIN_JAVA_VENDOR} \
346334
-Dlog4j2.configurationFile=log4j2-dev.xml \
@@ -364,7 +352,6 @@ pipeline {
364352
stage('Full Java tests') {
365353
when {
366354
anyOf {
367-
branch 'master'; branch 'develop'
368355
expression { return params.FULL_JAVA_TESTS }
369356
}
370357
not {

0 commit comments

Comments
 (0)