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.

Sign up for GitHub

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

Jump to bottom

Set job variables for PR builds based on PR case not build case #4017

Merged
merged 1 commit into from
Jan 19, 2019
Merged

Set job variables for PR builds based on PR case not build case #4017

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 1 addition & 7 deletions buildenv/jenkins/common/variables-functions
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -729,18 +729,12 @@ def set_job_variables(job_type) {
switch (job_type) {
case "build":
// set the node the Jenkins build would run on
set_node('build')
set_node(job_type)
// set variables for a build job
set_build_variables()
set_sdk_variables()
set_artifactory_config()
break
case "test":
// set the node the tests would run on
set_node('test')
// set variables for a test job
set_test_variables()
break
case "pullRequest":
// set the node the pull request job would run on
set_node('build')
Expand Down
40 changes: 8 additions & 32 deletions buildenv/jenkins/jobs/builds/Build-Test-Any-Platform
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,29 +35,16 @@ timeout(time: 10, unit: 'HOURS') {

variableFile = load 'buildenv/jenkins/common/variables-functions'

// identify the pipeline type: build, test or pull request and
// initialize required variables
if (run_tests()) {
if (!params.ghprbPullId) {
// test pipeline
variableFile.set_job_variables('test')
} else {
// pull request pipeline
variableFile.set_job_variables('pullRequest')
}
// identify the pipeline type: build or pull request and initialize required variables
if (params.ghprbPullId) {
variableFile.set_job_variables('pullRequest')
} else {
// build or pull request compile only pipeline
variableFile.set_job_variables('build')
}

if (!params.UPSTREAM_JOB_NAME && !params.UPSTREAM_JOB_NUMBER) {
// the test pipeline requires resources(e.g. a jdk) from an
// upstream build pipeline identified by the UPSTREAM_JOB_NAME,
// UPSTREAM_JOB_NAME parameters
// if they are not set then it is not a test pipeline, could be
// a build or a pull request pipeline, thus load resource here
// to avoid another source checkout on the slave
buildFile = load 'buildenv/jenkins/common/build'
buildFile = load 'buildenv/jenkins/common/build'
if (run_tests()) {
testFile = load 'buildenv/jenkins/common/test'
}
} finally {
// Temporarily turn off disableDeferredWipeout. See https://issues.jenkins-ci.org/browse/JENKINS-54225
Expand All @@ -72,19 +59,8 @@ timeout(time: 10, unit: 'HOURS') {
// clean up
buildFile.build_all()
} else {
checkout scm
testFile = load 'buildenv/jenkins/common/test'
cleanWs()
if (params.UPSTREAM_JOB_NAME && params.UPSTREAM_JOB_NUMBER) {
// test pipeline: fetch resources from upstream job, run tests,
// archive results, clean up
testFile.test_all_with_fetch()
} else {
// pull request pipeline: compile, run tests, archive results,
// clean up
buildFile.build_pr()
testFile.test_all()
}
buildFile.build_pr()
testFile.test_all()
}
}
}
Expand Down
60 changes: 0 additions & 60 deletions buildenv/jenkins/variables/defaults.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,13 +104,6 @@ linux_ppc-64_cmprssptrs_le:
11: 'ci.role.build && hw.arch.ppc64le && sw.os.ubuntu'
12: 'ci.role.build && hw.arch.ppc64le && sw.os.ubuntu'
next: 'ci.role.build && hw.arch.ppc64le && sw.os.ubuntu'
test:
8: 'hw.arch.ppc64le && sw.os.ubuntu'
9: 'hw.arch.ppc64le && sw.os.ubuntu'
10: 'hw.arch.ppc64le && sw.os.ubuntu'
11: 'hw.arch.ppc64le && sw.os.ubuntu'
12: 'hw.arch.ppc64le && sw.os.ubuntu'
next: 'hw.arch.ppc64le && sw.os.ubuntu'
extra_configure_options:
8: '--with-openssl=fetched --enable-openssl-bundling'
11: '--with-openssl=fetched --enable-openssl-bundling'
Expand Down Expand Up @@ -149,13 +142,6 @@ linux_390-64_cmprssptrs:
11: 'ci.role.build && hw.arch.s390x && sw.os.ubuntu'
12: 'ci.role.build && hw.arch.s390x && sw.os.ubuntu'
next: 'ci.role.build && hw.arch.s390x && sw.os.ubuntu'
test:
8: 'hw.arch.s390x && sw.os.ubuntu'
9: 'hw.arch.s390x && sw.os.ubuntu'
10: 'hw.arch.s390x && sw.os.ubuntu'
11: 'hw.arch.s390x && sw.os.ubuntu'
12: 'hw.arch.s390x && sw.os.ubuntu'
next: 'hw.arch.s390x && sw.os.ubuntu'
build_env:
vars:
11: 'CC=gcc-7 CXX=g++-7'
Expand Down Expand Up @@ -192,13 +178,6 @@ aix_ppc-64_cmprssptrs:
11: 'ci.role.build && hw.arch.ppc64 && sw.os.aix'
12: 'ci.role.build && hw.arch.ppc64 && sw.os.aix'
next: 'ci.role.build && hw.arch.ppc64 && sw.os.aix'
test:
8: 'hw.arch.ppc64 && sw.os.aix'
9: 'hw.arch.ppc64 && sw.os.aix'
10: 'hw.arch.ppc64 && sw.os.aix'
11: 'hw.arch.ppc64 && sw.os.aix'
12: 'hw.arch.ppc64 && sw.os.aix'
next: 'hw.arch.ppc64 && sw.os.aix'
extra_configure_options:
8: '--with-cups-include=/opt/freeware/include --disable-ccache --with-jobs=8'
9: '--with-cups-include=/opt/freeware/include --disable-warnings-as-errors --with-jobs=8'
Expand Down Expand Up @@ -234,13 +213,6 @@ linux_x86-64_cmprssptrs:
11: 'ci.role.build && hw.arch.x86 && sw.os.ubuntu'
12: 'ci.role.build && hw.arch.x86 && sw.os.ubuntu'
next: 'ci.role.build && hw.arch.x86 && sw.os.ubuntu'
test:
8: 'hw.arch.x86 && sw.os.ubuntu'
9: 'hw.arch.x86 && sw.os.ubuntu'
10: 'hw.arch.x86 && sw.os.ubuntu'
11: 'hw.arch.x86 && sw.os.ubuntu'
12: 'hw.arch.x86 && sw.os.ubuntu'
next: 'hw.arch.x86 && sw.os.ubuntu'
extra_configure_options:
8: '--with-openssl=fetched --enable-openssl-bundling'
11: '--with-openssl=fetched --enable-openssl-bundling'
Expand Down Expand Up @@ -277,13 +249,6 @@ linux_x86-64_cmprssptrs_cmake:
11: 'ci.role.build && hw.arch.x86 && sw.os.ubuntu'
12: 'ci.role.build && hw.arch.x86 && sw.os.ubuntu'
next: 'ci.role.build && hw.arch.x86 && sw.os.ubuntu'
test:
8: 'hw.arch.x86 && sw.os.ubuntu'
9: 'hw.arch.x86 && sw.os.ubuntu'
10: 'hw.arch.x86 && sw.os.ubuntu'
11: 'hw.arch.x86 && sw.os.ubuntu'
12: 'hw.arch.x86 && sw.os.ubuntu'
next: 'hw.arch.x86 && sw.os.ubuntu'
extra_configure_options:
8: '--with-cmake --disable-ddr --with-openssl=fetched --enable-openssl-bundling'
9: '--with-cmake --disable-ddr'
Expand Down Expand Up @@ -331,13 +296,6 @@ linux_x86-64:
11: 'ci.role.build && hw.arch.x86 && sw.os.ubuntu'
12: 'ci.role.build && hw.arch.x86 && sw.os.ubuntu'
next: 'ci.role.build && hw.arch.x86 && sw.os.ubuntu'
test:
8: 'hw.arch.x86 && sw.os.ubuntu'
9: 'hw.arch.x86 && sw.os.ubuntu'
10: 'hw.arch.x86 && sw.os.ubuntu'
11: 'hw.arch.x86 && sw.os.ubuntu'
12: 'hw.arch.x86 && sw.os.ubuntu'
next: 'hw.arch.x86 && sw.os.ubuntu'
extra_configure_options:
8: '--with-noncompressedrefs --with-openssl=fetched --enable-openssl-bundling'
9: '--with-noncompressedrefs'
Expand Down Expand Up @@ -385,13 +343,6 @@ win_x86-64_cmprssptrs:
11: 'ci.role.build && hw.arch.x86 && sw.os.windows'
12: 'ci.role.build && hw.arch.x86 && sw.os.windows'
next: 'ci.role.build && hw.arch.x86 && sw.os.windows'
test:
8: 'hw.arch.x86 && sw.os.windows'
9: 'hw.arch.x86 && sw.os.windows'
10: 'hw.arch.x86 && sw.os.windows'
11: 'hw.arch.x86 && sw.os.windows'
12: 'hw.arch.x86 && sw.os.windows'
next: 'hw.arch.x86 && sw.os.windows'
build_env:
vars:
8: 'PATH+TOOLS=/cygdrive/c/openjdk/LLVM64/bin:/cygdrive/c/openjdk/nasm-2.13.03'
Expand All @@ -413,8 +364,6 @@ win_x86:
node_labels:
build:
8: 'ci.role.build && hw.arch.x86 && sw.os.windows'
test:
8: 'hw.arch.x86 && sw.os.windows'
build_env:
vars:
8: 'PATH+TOOLS=/cygdrive/c/openjdk/LLVM32/bin:/cygdrive/c/openjdk/nasm-2.13.03'
Expand Down Expand Up @@ -443,11 +392,6 @@ osx_x86-64_cmprssptrs:
11: 'ci.role.build && hw.arch.x86 && sw.os.osx.10_13'
12: 'ci.role.build && hw.arch.x86 && sw.os.osx.10_13'
next: 'ci.role.build && hw.arch.x86 && sw.os.osx.10_13'
test:
8: 'hw.arch.x86 && sw.os.osx'
11: 'hw.arch.x86 && sw.os.osx'
12: 'hw.arch.x86 && sw.os.osx'
next: 'hw.arch.x86 && sw.os.osx'
build_env:
vars:
8: 'MACOSX_DEPLOYMENT_TARGET=10.9.0 SDKPATH=/Users/jenkins/Xcode4/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk'
Expand Down Expand Up @@ -477,10 +421,6 @@ osx_x86-64:
11: 'ci.role.build && hw.arch.x86 && sw.os.osx.10_13'
12: 'ci.role.build && hw.arch.x86 && sw.os.osx.10_13'
next: 'ci.role.build && hw.arch.x86 && sw.os.osx.10_13'
test:
8: 'hw.arch.x86 && sw.os.osx'
11: 'hw.arch.x86 && sw.os.osx'
12: 'hw.arch.x86 && sw.os.osx'
build_env:
vars:
8: 'MACOSX_DEPLOYMENT_TARGET=10.9.0 SDKPATH=/Users/jenkins/Xcode4/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk'