Skip to content

Commit

Permalink
Prep for prod release
Browse files Browse the repository at this point in the history
  • Loading branch information
@roceb
roceb committed Jan 19, 2025
1 parent 82b8b14 commit 06cdf99
Show file tree
Hide file tree
Showing 6 changed files with 102 additions and 107 deletions.
2 changes: 1 addition & 1 deletion etc/scipipe/build_matrix.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,5 +173,5 @@ newinstall:
github_repo: lsst/lsst
git_ref: tickets/DM-46554
eups:
base_url: https://eups.lsst.codes/stack_test
base_url: https://eups.lsst.codes/stack
s3_bucket: eups.lsst.codes
14 changes: 6 additions & 8 deletions pipelines/lib/util.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -687,18 +687,17 @@ def void createDirs(List eds) {
*/
def void getManifest(String rebuildId, String filename) {
def buildJob = 'release/run-rebuild'

step([$class: 'CopyArtifact',
def manifest_artifact = 'lsstsw/build/manifest.txt'
step([$class: 'CopyArtifact',
projectName: buildJob,
filter: "**/lsstsw/build/manifest.txt",
target: 'buildmanifest',
filter: manifest_artifact,
selector: [
$class: 'SpecificBuildSelector',
buildNumber: rebuildId // wants a string
],
])
def manifest = readFile('buildmanifest/lsstsw/build/manifest.txt')
writeFile(file: filename, text: manifest)
def manifest = readFile manifest_artifact
writeFile(file: filename, text: manifest)
} // getManifest

/**
Expand Down Expand Up @@ -1385,7 +1384,7 @@ def String runRebuild(Map p) {
wait: true,
)
nodeTiny {
manifestArtifact = 'lsstsw/build/manifest.txt'
manifestArtifact = 'lsstsw/build/manifest.txt'

step([$class: 'CopyArtifact',
projectName: useP.job,
Expand All @@ -1397,7 +1396,6 @@ def String runRebuild(Map p) {
])

def manifestId = parseManifestId(readFile(manifestArtifact))
// echo sh(returnStdout: true, script: 'env|sort')
echo "parsed manifest id: ${manifestId}"
return manifestId
} // nodeTiny
Expand Down
44 changes: 22 additions & 22 deletions pipelines/release/docker/build_stack.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,27 +153,27 @@ notify.wrap {
run()
}
} finally {
stage('archive') {
def resultsFile = 'results.json'

util.dumpJson(resultsFile, [
base_image: baseImage ?: null,
image: "${dockerRepo}:${dockerTag}",
docker_registry: [
repo: dockerRepo,
tag: dockerTag
],
])

archiveArtifacts([
artifacts: resultsFile,
fingerprint: true
])
} // stage
} // try
} // util.nodeWrap
}
}
parallel matrix
stage('archive') {
def resultsFile = 'results.json'

util.dumpJson(resultsFile, [
base_image: baseImage ?: null,
image: "${dockerRepo}:${dockerTag}",
docker_registry: [
repo: dockerRepo,
tag: dockerTag
],
])

archiveArtifacts([
artifacts: resultsFile,
fingerprint: true
])
} // stage
} // try
} // util.nodeWrap
}
}
parallel matrix

} // notify.wrap
141 changes: 70 additions & 71 deletions pipelines/release/nightly_release.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,7 @@ notify.wrap {

def run = {
stage('format nightly tag') {
//gitTag = "d.${year}.${month}.${day}"
gitTag = "test.${year}.${month}"
gitTag = "d.${year}.${month}.${day}"
eupsTag = util.sanitizeEupsTag(gitTag)
echo "generated [git] tag: ${gitTag}"
echo "generated [eups] tag: ${eupsTag}"
Expand All @@ -47,7 +46,7 @@ notify.wrap {
manifestId = util.runRebuild(
parameters: [
PRODUCTS: products,
BUILD_DOCS: false,
BUILD_DOCS: true,
],
)
} // retry
Expand All @@ -57,7 +56,7 @@ notify.wrap {
def pub = [:]

[eupsTag,
//'d_latest'
'd_latest'
].each { tagName ->
pub[tagName] = {
retry(retries) {
Expand Down Expand Up @@ -138,80 +137,80 @@ notify.wrap {
EUPS_TAG: eupsTag,
DOCKER_TAGS: extraDockerTags,
MANIFEST_ID: manifestId,
LSST_COMPILER: lsstswConfig.compiler[0],
LSST_COMPILER: lsstswConfig.compiler,
],
)
} // retry
} // stage

def triggerMe = [:]

// triggerMe['build Science Platform Notebook Aspect Lab image'] = {
// retry(retries) {
// // based on lsstsqre/stack image
// build(
// job: 'sqre/infra/build-sciplatlab',
// parameters: [
// string(name: 'TAG', value: eupsTag),
// ],
// wait: false,
// )
// } // retry
// }

// triggerMe['verify_drp_metrics'] = {
// retry(1) {
// // based on lsstsqre/stack image
// build(
// job: 'sqre/verify_drp_metrics',
// parameters: [
// string(name: 'DOCKER_IMAGE', value: stackResults.image),
// booleanParam(
// name: 'NO_PUSH',
// value: scipipe.release.step.verify_drp_metrics.no_push,
// ),
// booleanParam(name: 'WIPEOUT', value: false),
// string(name: 'GIT_REF', value: 'main'),
// ],
// wait: false,
// )
// } // retry
// }

// triggerMe['doc build'] = {
// retry(retries) {
// build(
// job: 'sqre/infra/documenteer',
// parameters: [
// string(name: 'EUPS_TAG', value: eupsTag),
// string(name: 'LTD_SLUG', value: eupsTag),
// string(name: 'RELEASE_IMAGE', value: stackResults.image),
// booleanParam(
// name: 'PUBLISH',
// value: scipipe.release.step.documenteer.publish,
// ),
// ],
// wait: false,
// )
// } // retry
// }

// triggerMe['ap_verify'] = {
// retry(retries) {
// build(
// job: 'scipipe/ap_verify',
// parameters: [
// string(name: 'DOCKER_IMAGE', value: stackResults.image),
// booleanParam(
// name: 'NO_PUSH',
// value: scipipe.release.step.ap_verify.no_push,
// ),
// booleanParam(name: 'WIPEOUT', value: false),
// ],
// wait: false,
// )
// } // retry
// }
triggerMe['build Science Platform Notebook Aspect Lab image'] = {
retry(retries) {
// based on lsstsqre/stack image
build(
job: 'sqre/infra/build-sciplatlab',
parameters: [
string(name: 'TAG', value: eupsTag),
],
wait: false,
)
} // retry
}

triggerMe['verify_drp_metrics'] = {
retry(1) {
// based on lsstsqre/stack image
build(
job: 'sqre/verify_drp_metrics',
parameters: [
string(name: 'DOCKER_IMAGE', value: stackResults.image),
booleanParam(
name: 'NO_PUSH',
value: scipipe.release.step.verify_drp_metrics.no_push,
),
booleanParam(name: 'WIPEOUT', value: false),
string(name: 'GIT_REF', value: 'main'),
],
wait: false,
)
} // retry
}

triggerMe['doc build'] = {
retry(retries) {
build(
job: 'sqre/infra/documenteer',
parameters: [
string(name: 'EUPS_TAG', value: eupsTag),
string(name: 'LTD_SLUG', value: eupsTag),
string(name: 'RELEASE_IMAGE', value: stackResults.image),
booleanParam(
name: 'PUBLISH',
value: scipipe.release.step.documenteer.publish,
),
],
wait: false,
)
} // retry
}

triggerMe['ap_verify'] = {
retry(retries) {
build(
job: 'scipipe/ap_verify',
parameters: [
string(name: 'DOCKER_IMAGE', value: stackResults.image),
booleanParam(
name: 'NO_PUSH',
value: scipipe.release.step.ap_verify.no_push,
),
booleanParam(name: 'WIPEOUT', value: false),
],
wait: false,
)
} // retry
}

stage('triggered jobs') {
parallel triggerMe
Expand Down
3 changes: 1 addition & 2 deletions pipelines/release/run_publish.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,7 @@ notify.wrap {
}
def slug = util.lsstswConfigSlug(lsstswConfig)
def run = {
def workingDir = canonical.workspace
ws(workingDir) {
ws(canonical.workspace) {
def cwd = pwd()
def pkgroot = "${cwd}/distrib"

Expand Down
5 changes: 2 additions & 3 deletions pipelines/release/run_rebuild.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,7 @@ notify.wrap {
def slug = util.lsstswConfigSlug(lsstswConfig)

def run = {
def workingDir = canonical.workspace
ws(workingDir) {
ws(canonical.workspace) {
def cwd = pwd()
splenvRef = lsstswConfig.splenv_ref
if (params.SPLENV_REF) {
Expand All @@ -69,7 +68,7 @@ notify.wrap {
LSST_PYTHON_VERSION: lsstswConfig.python,
LSST_SPLENV_REF: splenvRef,
LSST_REFS: refs,
VERSIONDB_PUSH: versiondbPush,
VERSIONDB_PUSH: versiondbPush,
VERSIONDB_REPO: versiondbRepo,
]

Expand Down

0 comments on commit 06cdf99

Please sign in to comment.