Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DM-46554: Add arch64 to nightly release #1049

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
Open
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
12 changes: 7 additions & 5 deletions etc/scipipe/build_matrix.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,11 @@ scipipe-lsstsw-ci_imsim:
canonical:
products: &canonical_products lsst_distrib lsst_ci lsst_middleware
lsstsw_config:
<<: *el7-conda
label: snowflake-0
display_name: centos-7
- <<: *el7-conda
label: snowflake-0
- <<: *linux-9-arm
label: snowflake-arch-0
splenv_ref: *splenv_ref
workspace: snowflake/release
#
# eups distrib tarball configuration -- used by
Expand Down Expand Up @@ -155,7 +157,7 @@ newinstall:
repo: ghcr.io/lsst-dm/docker-newinstall
tag: 9-latest
github_repo: lsst/lsst
git_ref: main
git_ref: tickets/DM-48154
eups:
base_url: https://eups.lsst.codes/stack
base_url: https://eups.lsst.codes/stack_test
s3_bucket: eups.lsst.codes
2 changes: 1 addition & 1 deletion jobs/run_publish.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ p.pipeline().with {
stringParam('SPLENV_REF', scipipe.template.splenv_ref, 'conda env ref')
stringParam('RUBINENV_VER', scipipe.template.splenv_ref, 'conda env ref')
// enable for debugging only
// booleanParam('NO_PUSH', true, 'Skip s3 push.')
booleanParam('NO_PUSH', true, 'Skip s3 push.')
}
}
34 changes: 18 additions & 16 deletions pipelines/lib/util.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,8 @@ def void runPublish(Map p) {
'PRODUCTS',
])
useP.parameters = [
TIMEOUT: '1' // should be string
TIMEOUT: '1', // should be string
NO_PUSH: true
] + p.parameters

def jobParameters = [
Expand Down Expand Up @@ -626,7 +627,7 @@ def void requireEnvVars(List rev) {
// note that `env` isn't a map and #get doesn't work as expected
rev.each { it ->
if (env."${it}" == null) {
error "${it} envirnoment variable is required"
error "${it} environment variable is required"
}
}
}
Expand Down Expand Up @@ -686,20 +687,19 @@ def void createDirs(List eds) {
* @param filename String Output filename.
*/
def void getManifest(String rebuildId, String filename) {
def manifest_artifact = 'lsstsw/build/manifest.txt'
def buildJob = 'release/run-rebuild'

step([$class: 'CopyArtifact',
step([$class: 'CopyArtifact',
projectName: buildJob,
filter: manifest_artifact,
selector: [
$class: 'SpecificBuildSelector',
filter: "**/lsstsw/build/manifest.txt",
target: 'buildmanifest',
selector: [
$class: 'SpecificBuildSelector',
buildNumber: rebuildId // wants a string
],
])

def manifest = readFile manifest_artifact
writeFile(file: filename, text: manifest)
],
])
def manifest = readFile('buildmanifest/lsstsw/build/manifest.txt')
writeFile(file: filename, text: manifest)
} // getManifest

/**
Expand Down Expand Up @@ -1385,20 +1385,21 @@ def String runRebuild(Map p) {
parameters: jobParameters,
wait: true,
)

nodeTiny {
manifestArtifact = 'lsstsw/build/manifest.txt'

step([$class: 'CopyArtifact',
projectName: useP.job,
filter: manifestArtifact,
filter: "**/lsstsw/build/manifest.txt",
//target: manifestArtifact,
target: 'buildmanifest',
selector: [
$class: 'SpecificBuildSelector',
buildNumber: result.id,
],
])
def manifestId = parseManifestId(readFile('buildmanifest/lsstsw/build/manifest.txt'))
// echo sh(returnStdout: true, script: 'env|sort')

def manifestId = parseManifestId(readFile(manifestArtifact))
echo "parsed manifest id: ${manifestId}"
return manifestId
} // nodeTiny
Expand Down Expand Up @@ -2300,4 +2301,5 @@ def void nodeWrap(String label, Closure run) {
}
}


return this;
16 changes: 14 additions & 2 deletions pipelines/release/docker/build_stack.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@ notify.wrap {
String manifestId = params.MANIFEST_ID ?: ''
String lsstCompiler = params.LSST_COMPILER ?: ''


def canonical = scipipe.canonical
def lsstswConfigs = canonical.lsstsw_config
def release = scipipe.scipipe_release
def dockerfile = release.dockerfile
def dockerRegistry = release.docker_registry
Expand All @@ -49,9 +52,14 @@ notify.wrap {
def timestamp = util.epochMilliToUtc(currentBuild.startTimeInMillis)
def shebangtronUrl = util.shebangtronUrl()

def matrix = [:]
lsstswConfigs.each{ lsstswConfig ->
def slug = util.lsstswConfigSlug(lsstswConfig)
matrix[slug] ={

def newinstallImage = newinstall.docker_registry.repo
def newinstallTagBase = newinstall.docker_registry.tag
def splenvRef = scipipe.canonical.lsstsw_config.splenv_ref
def splenvRef = lsstswConfig.splenv_ref
if (params.SPLENV_REF) {
splenvRef = params.SPLENV_REF
}
Expand Down Expand Up @@ -139,7 +147,7 @@ notify.wrap {
} // push
} // run

util.nodeWrap('docker') {
util.nodeWrap(lsstswConfig.label) {
try {
timeout(time: timelimit, unit: 'HOURS') {
run()
Expand All @@ -164,4 +172,8 @@ notify.wrap {
} // stage
} // try
} // util.nodeWrap
}
}
parallel matrix

} // notify.wrap
Loading
Loading