Skip to content

Commit

Permalink
Update apverify
Browse files Browse the repository at this point in the history
  • Loading branch information
@roceb
roceb committed Jan 28, 2025
1 parent 3e3185e commit f90fe3a
Show file tree
Hide file tree
Showing 3 changed files with 94 additions and 91 deletions.
8 changes: 6 additions & 2 deletions pipelines/lib/util.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1755,7 +1755,7 @@ def void checkoutLFS(Map p) {

def gitRepo = githubSlugToUrl(p.githubSlug)

def lfsImage = 'lsstsqre/gitlfs'
def lfsImage = 'ghcr.io/lsst-dm/docker-newinstall'

// running a git clone in a docker.inside block is broken
git([
Expand All @@ -1770,7 +1770,11 @@ def void checkoutLFS(Map p) {
image: lfsImage,
pull: true,
) {
bash('git lfs pull origin')
bash("""
source /opt/lsst/software/stack/loadLSST.bash
git lfs install --skip-repo
git lfs pull origin
""")
}
} finally {
// try not to break jenkins clone mangement
Expand Down
2 changes: 1 addition & 1 deletion pipelines/release/docker/build_stack.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ notify.wrap {
}
} finally {
stage('archive') {
def resultsFile = lsstswConfig.displayname + 'results.json'
def resultsFile = 'results.json'

util.dumpJson(resultsFile, [
base_image: baseImage ?: null,
Expand Down
175 changes: 87 additions & 88 deletions pipelines/release/nightly_release.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,102 +34,100 @@ notify.wrap {
def lsstswConfig = scipipe.canonical.lsstsw_config

def run = {
//stage('format nightly tag') {
// gitTag = "exp.d.${year}.${month}.${day}"
// eupsTag = util.sanitizeEupsTag(gitTag)
// echo "generated [git] tag: ${gitTag}"
// echo "generated [eups] tag: ${eupsTag}"
//} // stage
stage('format nightly tag') {
gitTag = "exp.d.${year}.${month}.${day}"
eupsTag = util.sanitizeEupsTag(gitTag)
echo "generated [git] tag: ${gitTag}"
echo "generated [eups] tag: ${eupsTag}"
} // stage

//stage('build') {
// retry(retries) {
// manifestId = util.runRebuild(
// parameters: [
// PRODUCTS: products,
// BUILD_DOCS: true,
// ],
// )
// } // retry
//} // stage
stage('build') {
retry(retries) {
manifestId = util.runRebuild(
parameters: [
PRODUCTS: products,
BUILD_DOCS: true,
],
)
} // retry
} // stage

//stage('eups publish') {
// def pub = [:]
stage('eups publish') {
def pub = [:]

// [eupsTag,
// //'d_latest'
// ].each { tagName ->
// pub[tagName] = {
// retry(retries) {
// util.runPublish(
// parameters: [
// EUPSPKG_SOURCE: 'git',
// MANIFEST_ID: manifestId,
// EUPS_TAG: tagName,
// PRODUCTS: products,
// BUILD_DOCS: true,
// ],
// )
// } // retry
// } // pub
// } // each
[eupsTag,
//'d_latest'
].each { tagName ->
pub[tagName] = {
retry(retries) {
util.runPublish(
parameters: [
EUPSPKG_SOURCE: 'git',
MANIFEST_ID: manifestId,
EUPS_TAG: tagName,
PRODUCTS: products,
BUILD_DOCS: true,
],
)
} // retry
} // pub
} // each

// parallel pub
//} // stage
parallel pub
} // stage

//util.waitForS3()
util.waitForS3()

//// NOOP / DRY_RUN
//stage('git tag eups products') {
// retry(retries) {
// util.nodeWrap('docker') {
// // needs eups distrib tag to be sync'd from s3 -> k8s volume
// util.githubTagRelease(
// options: [
// '--dry-run': true,
// '--org': scipipe.release_tag_org,
// '--manifest': manifestId,
// '--eups-tag': eupsTag,
// ],
// args: [gitTag],
// )
// } // util.nodeWrap
// } // retry
//} // stage
// NOOP / DRY_RUN
stage('git tag eups products') {
retry(retries) {
util.nodeWrap('docker') {
// needs eups distrib tag to be sync'd from s3 -> k8s volume
util.githubTagRelease(
options: [
'--dry-run': true,
'--org': scipipe.release_tag_org,
'--manifest': manifestId,
'--eups-tag': eupsTag,
],
args: [gitTag],
)
} // util.nodeWrap
} // retry
} // stage

//// add aux repo tags *after* tagging eups product repos so as to avoid a
//// trainwreck if an aux repo has been pulled into the build (without
//// first being removed from the aux team).
//stage('git tag auxilliaries') {
// retry(retries) {
// util.nodeWrap('docker') {
// util.githubTagTeams(
// options: [
// '--dry-run': true,
// '--org': scipipe.release_tag_org,
// '--tag': gitTag,
// ],
// )
// } // util.nodeWrap
// } // retry
//} // stage
// add aux repo tags *after* tagging eups product repos so as to avoid a
// trainwreck if an aux repo has been pulled into the build (without
// first being removed from the aux team).
stage('git tag auxilliaries') {
retry(retries) {
util.nodeWrap('docker') {
util.githubTagTeams(
options: [
'--dry-run': true,
'--org': scipipe.release_tag_org,
'--tag': gitTag,
],
)
} // util.nodeWrap
} // retry
} // stage

//stage('build eups tarballs') {
// util.buildTarballMatrix(
// tarballConfigs: scipipe.tarball.build_config,
// parameters: [
// PRODUCTS: tarballProducts,
// EUPS_TAG: eupsTag,
// SMOKE: true,
// RUN_SCONS_CHECK: true,
// PUBLISH: true,
// ],
// retries: retries,
// )
//} // stage
stage('build eups tarballs') {
util.buildTarballMatrix(
tarballConfigs: scipipe.tarball.build_config,
parameters: [
PRODUCTS: tarballProducts,
EUPS_TAG: eupsTag,
SMOKE: true,
RUN_SCONS_CHECK: true,
PUBLISH: true,
],
retries: retries,
)
} // stage

//util.waitForS3()
manifestId = 'b7498'
eupsTag = 'exp_d_2025_01_22'
util.waitForS3()

stage('build stack image') {
retry(retries) {
Expand Down Expand Up @@ -159,6 +157,7 @@ notify.wrap {
// )
// } // retry
//}
stackResults = ['image':'lsstsqre/centos:7-stack-lsst_distrib-exp_d_2025_01_22']

triggerMe['verify_drp_metrics x86'] = {
retry(1) {
Expand Down Expand Up @@ -255,7 +254,7 @@ notify.wrap {
}

stage('triggered jobs') {
// parallel triggerMe
parallel triggerMe
} // stage
} // run

Expand Down

0 comments on commit f90fe3a

Please sign in to comment.