Skip to content

Commit

Permalink
Fixed JenkinsFile
Browse files Browse the repository at this point in the history
  • Loading branch information
pkubanek committed Feb 12, 2024
1 parent 9fa2de3 commit 48b5a53
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,13 @@ properties(
node {
def SALUSER_HOME = "/home/saluser"
def BRANCH = (env.CHANGE_BRANCH != null) ? env.CHANGE_BRANCH : env.BRANCH_NAME
def SAME_CRIO_BRANCH = ["main", "tickets/DM-41336", "tickets/DM-42503"]
def SAME_CRIO_BRANCH = ["main", "tickets/DM-42503"]
def CRIO_BRANCH=(BRANCH in SAME_CRIO_BRANCH) ? BRANCH : "develop"

stage('Cloning sources')
{
dir("ts_cRIOcpp") {
git branch: (BRANCH in SAME_CRIO_BRANCH) ? BRANCH : "develop", url: 'https://github.com/lsst-ts/ts_cRIOcpp'
git branch: CRIO_BRANCH, url: 'https://github.com/lsst-ts/ts_cRIOcpp'
}
dir("ts_m1m3thermal") {
checkout scm
Expand All @@ -35,7 +36,7 @@ node {

stage('Building dev container')
{
M1M3sim = docker.build("lsstts/mtm1m3_sim:" + env.BRANCH_NAME.replace("/", "_"), "--target crio-develop --build-arg XML_BRANCH=$BRANCH " + (params.noCache ? "--no-cache " : " ") + "$WORKSPACE/ts_m1m3thermal")
M1M3sim = docker.build("lsstts/mtm1m3_sim:" + env.BRANCH_NAME.replace("/", "_"), "--target crio-develop --build-arg XML_BRANCH=$BRANCH cRIO_CPP=$CRIO_BRANCH" + (params.noCache ? " --no-cache " : " ") + "$WORKSPACE/ts_m1m3thermal")
}

stage("Running tests")
Expand Down

0 comments on commit 48b5a53

Please sign in to comment.