ci: drop commonPrep function, call individual ones

This function did too many things, some of them unnecessary.

Requires: https://github.com/status-im/status-jenkins-lib/pull/48

Signed-off-by: Jakub Sokołowski <jakub@status.im>
This commit is contained in:
Jakub Sokołowski 2022-09-14 12:16:55 +02:00
parent c147b807ef
commit f027b6024a
No known key found for this signature in database
GPG Key ID: 09AA5403E54D9931
8 changed files with 16 additions and 21 deletions

View File

@ -1,4 +1,4 @@
library 'status-jenkins-lib@v1.5.3' library 'status-jenkins-lib@v1.5.4'
/* Options section can't access functions in objects. */ /* Options section can't access functions in objects. */
def isPRBuild = utils.isPRBuild() def isPRBuild = utils.isPRBuild()
@ -49,10 +49,9 @@ pipeline {
stage('Prep') { stage('Prep') {
steps { steps {
script { script {
btype = utils.getBuildType() utils.doGitRebasePR()
print "Running ${btype} build!" utils.symlinkEnv()
/* Cleanup and Prep */ println("Build Number: ${utils.genBuildNumber()}")
commonPrep(btype)
} }
} }
} }

View File

@ -1,4 +1,4 @@
library 'status-jenkins-lib@v1.5.3' library 'status-jenkins-lib@v1.5.4'
pipeline { pipeline {
agent { label 'linux' } agent { label 'linux' }
@ -33,7 +33,7 @@ pipeline {
stages { stages {
stage('Prep') { stage('Prep') {
steps { script { steps { script {
println "Current JOB: ${env.JOB_NAME}" println("Current JOB: ${env.JOB_NAME}")
/* just for a shorter access */ /* just for a shorter access */
btype = utils.getBuildType() btype = utils.getBuildType()
} } } }

View File

@ -1,4 +1,4 @@
library 'status-jenkins-lib@v1.5.3' library 'status-jenkins-lib@v1.5.4'
/* Options section can't access functions in objects. */ /* Options section can't access functions in objects. */
def isPRBuild = utils.isPRBuild() def isPRBuild = utils.isPRBuild()
@ -48,10 +48,9 @@ pipeline {
stage('Prep') { stage('Prep') {
steps { steps {
script { script {
btype = utils.getBuildType() utils.doGitRebasePR()
print "Running ${btype} build!" utils.symlinkEnv()
/* Cleanup and Prep */ println("Build Number: ${utils.genBuildNumber()}")
commonPrep(btype)
} }
} }
} }

View File

@ -1,4 +1,4 @@
library 'status-jenkins-lib@v1.5.3' library 'status-jenkins-lib@v1.5.4'
pipeline { pipeline {
agent { label params.AGENT_LABEL } agent { label params.AGENT_LABEL }

View File

@ -1,4 +1,4 @@
library 'status-jenkins-lib@v1.5.0' library 'status-jenkins-lib@v1.5.4'
/* Options section can't access functions in objects. */ /* Options section can't access functions in objects. */
def isPRBuild = utils.isPRBuild() def isPRBuild = utils.isPRBuild()
@ -44,10 +44,7 @@ pipeline {
stage('Prep') { stage('Prep') {
steps { steps {
script { script {
btype = utils.getBuildType() utils.doGitRebasePR()
print "Running ${btype} build!"
/* Cleanup and Prep */
commonPrep(btype)
} }
} }
} }

View File

@ -1,4 +1,4 @@
library 'status-jenkins-lib@v1.5.3' library 'status-jenkins-lib@v1.5.4'
pipeline { pipeline {

View File

@ -1,4 +1,4 @@
library 'status-jenkins-lib@v1.5.3' library 'status-jenkins-lib@v1.5.4'
pipeline { pipeline {
agent { label 'macos' } agent { label 'macos' }

View File

@ -1,4 +1,4 @@
library 'status-jenkins-lib@v1.5.3' library 'status-jenkins-lib@v1.5.4'
pipeline { pipeline {
agent { label 'linux' } agent { label 'linux' }