diff --git a/.ci/Jenkinsfile b/.ci/Jenkinsfile index 8b8faefaf24b5f3b5981c3e57e9736099eecf05f..4219deb2c235948621d7de03ccf20716c3e37f38 100644 --- a/.ci/Jenkinsfile +++ b/.ci/Jenkinsfile @@ -1,10 +1,12 @@ -@Library("jenlib") _ +@Library("jenlib@ebrains-4.0") _ -Map<String, Object> bss1PipelineArgs = [container : [app: "wafer"], - configureInstallOptions: "--without-pybind", - notificationChannel: "#visionary-wafer-users"] +// Don't build BSS1 +//Map<String, Object> bss1PipelineArgs = [container : [app: "wafer"], +// configureInstallOptions: "--without-pybind", +// notificationChannel: "#visionary-wafer-users"] Map<String, Object> bss2PipelineArgs = [container : [app: "dls"], + setupOptions : "--release-branch=ebrains-4.0", notificationChannel: "#dls-software"] // BSS-2 @@ -15,7 +17,10 @@ withCcache() { try { Boolean isMergeEvent = env.GERRIT_EVENT_TYPE == "change-merged" Boolean isSuccessful = currentBuild.currentResult == "SUCCESS" - Boolean doDeploy = isMergeEvent && isSuccessful + + // We do not deploy hwdb in ebrains-4.0 + //Boolean doDeploy = isMergeEvent && isSuccessful + Boolean doDeploy = false conditionalStage(name: "Yaml Deployment", skip: !doDeploy) { runOnSlave(label: "frontend") { @@ -47,47 +52,47 @@ runOnSlave(label: "frontend") { cleanWs() } -// BSS-1 -withCcache() { - wafDefaultPipeline([projects: ["hwdb"]] << bss1PipelineArgs) -} - -// Syntax Check, to be migrated to a waf test (issue #3604) -stage("Syntax Check") { - inSingularity(bss1PipelineArgs["container"]) { - runOnSlave(label: "frontend") { - jesh("python -c \"import yaml; [None for elem in yaml.load_all(open('hwdb/db.yaml'), Loader=yaml.FullLoader)]\"") - } - } -} - -try { - Boolean isMergeEvent = env.GERRIT_EVENT_TYPE == "change-merged" - Boolean isSuccessful = currentBuild.currentResult == "SUCCESS" - Boolean doDeploy = isMergeEvent && isSuccessful - - conditionalStage(name: "Yaml Deployment", skip: !doDeploy) { - runOnSlave(label: "frontend") { - jesh("cd /wang/data/bss-hwdb && " + - "umask 002 && " + // allow F9 to write stuff too - "cp ${WORKSPACE}/hwdb/db.yaml .db.yaml.tmp && " + - "mv .db.yaml.tmp db.yaml") - } - } - - conditionalStage(name: "Module Deployment", skip: !doDeploy) { - runOnSlave(label: "frontend") { - inSingularity(bss1PipelineArgs["container"]) { - deployModule([name : "hwdb_bss1", - source: "bin/ lib/ repos_log.txt"]) - } - } - } -} catch (Throwable t) { - notifyFailure(mattermostChannel: bss1PipelineArgs["notificationChannel"]) - throw t -} - -if (currentBuild.currentResult != "SUCCESS") { - notifyFailure(mattermostChannel: bss1PipelineArgs["notificationChannel"]) -} +//// BSS-1 +//withCcache() { +// wafDefaultPipeline([projects: ["hwdb"]] << bss1PipelineArgs) +//} +// +//// Syntax Check, to be migrated to a waf test (issue #3604) +//stage("Syntax Check") { +// inSingularity(bss1PipelineArgs["container"]) { +// runOnSlave(label: "frontend") { +// jesh("python -c \"import yaml; [None for elem in yaml.load_all(open('hwdb/db.yaml'), Loader=yaml.FullLoader)]\"") +// } +// } +//} +// +//try { +// Boolean isMergeEvent = env.GERRIT_EVENT_TYPE == "change-merged" +// Boolean isSuccessful = currentBuild.currentResult == "SUCCESS" +// Boolean doDeploy = isMergeEvent && isSuccessful +// +// conditionalStage(name: "Yaml Deployment", skip: !doDeploy) { +// runOnSlave(label: "frontend") { +// jesh("cd /wang/data/bss-hwdb && " + +// "umask 002 && " + // allow F9 to write stuff too +// "cp ${WORKSPACE}/hwdb/db.yaml .db.yaml.tmp && " + +// "mv .db.yaml.tmp db.yaml") +// } +// } +// +// conditionalStage(name: "Module Deployment", skip: !doDeploy) { +// runOnSlave(label: "frontend") { +// inSingularity(bss1PipelineArgs["container"]) { +// deployModule([name : "hwdb_bss1", +// source: "bin/ lib/ repos_log.txt"]) +// } +// } +// } +//} catch (Throwable t) { +// notifyFailure(mattermostChannel: bss1PipelineArgs["notificationChannel"]) +// throw t +//} +// +//if (currentBuild.currentResult != "SUCCESS") { +// notifyFailure(mattermostChannel: bss1PipelineArgs["notificationChannel"]) +//} diff --git a/.gitreview b/.gitreview index 60914c8a4549bc6b5ed20a42d4928d420caf9c44..39c849b93dfdc1bddfc5f4f11e06d9de382fce5c 100644 --- a/.gitreview +++ b/.gitreview @@ -2,6 +2,6 @@ host=brainscales-r.kip.uni-heidelberg.de port=29418 project=hwdb -defaultbranch=master +defaultbranch=ebrains-4.0 defaultremote=review defaultrebase=0