Correct build all script; Correct release note script

This commit is contained in:
Dan Hawkins 2020-10-24 21:30:13 +01:00
commit 9e1831c6b2
2 changed files with 9 additions and 48 deletions

View file

@ -31,11 +31,11 @@ pipeline {
stage('Compile') {
steps {
script {
modules_compile_job = build job: INK_UI_COMPILE_JOB,
modules_compile_job = build job: CUSTOM_MODULES_COMPILE_JOB,
parameters: [
string(name: 'SOURCE_REVISION', value: SOURCEREVISION),
string(name: 'ATLAS_UI_ARTIFACT_LOCATION', value: ATLAS_UI_ARTIFACT_LOCATION,
string(name: 'ATLAS_UI_COMPILE_JOB', value: ATLAS_UI_COMPILE_JOB,
string(name: 'ATLAS_UI_ARTIFACT_LOCATION', value: ATLAS_UI_ARTIFACT_LOCATION),
string(name: 'ATLAS_UI_COMPILE_JOB', value: ATLAS_UI_COMPILE_JOB),
string(name: 'ATLAS_UI_BUILD_SELECTOR', value: ATLAS_UI_BUILD_SELECTOR),
string(name: 'ATLAS_UI_RELEASE_REPO', value: ATLAS_UI_RELEASE_REPO),
string(name: 'ATLAS_UI_RELEASE_REVISION', value: ATLAS_UI_RELEASE_REVISION),
@ -55,7 +55,7 @@ pipeline {
stage('Build Ink UI installers') {
steps {
script {
modules_installer_job = build job: INK_UI_INSTALLER_BUILD_JOB
modules_installer_job = build job: CUSTOM_MODULES_INSTALLER_BUILD_JOB
parameters: [
string(name: 'SOURCE_REVISION', value: SOURCEREVISION),
string(name: 'ATLAS_CUSTOM_MODULES_COMPILE_JOB', value: modules_compile_job.getProjectName()),

View file

@ -35,13 +35,12 @@ pipeline {
stage('Checkout source') {
steps {
script {
SOURCEURL = 'git@hydra:gis/atlas_ui.git'
SOURCEURL = 'git@hydra:atlas-ui-modules/custom-modules.git'
SOURCEREVISION = SOURCE_REVISION
SOURCEDIR = "${WORKSPACE}\\atlas_ui"
SOURCEROOTDIR = 'atlas_ui'
configurationhelper.gitCheckoutAndRegister(meta, 'atlas_ui', SOURCEURL, SOURCEREVISION, SOURCEDIR, SOURCEROOTDIR, 0, false)
SOURCEDIR = "${WORKSPACE}\\custom_modules"
configurationhelper.gitCheckoutAndRegister(meta, 'custom_modules', SOURCEURL, SOURCEREVISION, SOURCEDIR, '', 0, false)
env.SOURCE_PATH = SOURCEDIR
env.JOBSCRIPTS = "${SOURCE_PATH}\\autobuild\\build_Atlas"
env.JOBSCRIPTS = "${SOURCE_PATH}\\autobuild\\build"
env.JOBSCRIPTS_COMMON = "${SOURCE_PATH}\\autobuild\\common"
env.SRC = SOURCE_PATH
}
@ -51,12 +50,8 @@ pipeline {
steps {
script {
env.RELEASE_NOTES = "release_notes"
env.PSBIN = "${WORKSPACE}/ps_bin"
env.ASBIN = "${WORKSPACE}/as_bin"
cleanfolders = [
RELEASE_NOTES,
PSBIN,
ASBIN,
]
cleaner = load("${autobuilder.commonscripts()}/clean/clean.groovy")
cleaner.clean(cleanfolders)
@ -67,41 +62,7 @@ pipeline {
steps {
script {
version = load("${autobuilder.commonscripts()}/versionnumbering/generate.groovy")
version.generate(meta, SOURCE_REVISION, SOURCE_PATH, BASEBUILDNUMBER)
}
}
}
stage('Import Print server to adjust version number') {
steps {
script {
importer = load("${autobuilder.commonscripts()}/import/importer.groovy")
def psartifactfiles = "meta/**"
psmeta = importer.artifactimport(meta,
PRINT_SERVER_ARTIFACT_LOCATION,
PRINT_SERVER_COMPILE_JOB,
PRINT_SERVER_BUILD_SELECTOR,
PRINT_SERVER_RELEASE_REPO,
PRINT_SERVER_RELEASE_REVISION,
PSBIN,
true,
psartifactfiles)
}
}
}
stage('Import Atlas services to adjust version number') {
steps {
script {
def asartifactfiles = "meta/**"
asmeta = importer.artifactimport(meta,
ATLAS_SERVICES_ARTIFACT_LOCATION,
ATLAS_SERVICES_COMPILE_JOB,
ATLAS_SERVICES_BUILD_SELECTOR,
ATLAS_SERVICES_RELEASE_REPO,
ATLAS_SERVICES_RELEASE_REVISION,
ASBIN,
true,
asartifactfiles)
version.generate(meta, SOURCE_REVISION, SOURCE_PATH)
}
}
}