Skip to content

Commit

Permalink
Remove obsolete pipeline code
Browse files Browse the repository at this point in the history
- We no longer run our own testing so this
  code is no longer needed.
- Remove PullRequest pipelines as they are no longer in use.
- Combine 'build' and 'pullRequest' variable setup cases
  as they are identical.
- Also remove temp reverse spec map used prior to eclipse-openj9#2836.

Related eclipse-openj9#1450
Depends eclipse-openj9#2728 eclipse-openj9#2638 eclipse-openj9#2467 eclipse-openj9#2272 eclipse-openj9#2836 eclipse-openj9#4443
[skip ci]
Signed-off-by: Adam Brousseau <adam.brousseau88@gmail.com>
  • Loading branch information
AdamBrousseau committed Jun 11, 2019
1 parent 323198b commit a0819cf
Show file tree
Hide file tree
Showing 58 changed files with 2 additions and 2,858 deletions.
12 changes: 0 additions & 12 deletions buildenv/jenkins/common/build
Original file line number Diff line number Diff line change
Expand Up @@ -348,8 +348,6 @@ def add_node_to_description() {
}

def build_all() {

// Typically called by Build jobs and Compile only PRs
timeout(time: 6, unit: 'HOURS') {
try {
// Cleanup in case an old build left anything behind
Expand All @@ -365,14 +363,4 @@ def build_all() {
}
}

def build_pr() {

// Called by PR Compile & Test jobs
// Does not cleanup as it is expected testing will occur, followed by cleanup
timeout(time: 6, unit: 'HOURS') {
get_source()
build()
}
}

return this
132 changes: 0 additions & 132 deletions buildenv/jenkins/common/test

This file was deleted.

40 changes: 0 additions & 40 deletions buildenv/jenkins/common/variables-functions
Original file line number Diff line number Diff line change
Expand Up @@ -444,16 +444,6 @@ def get_date() {
).trim()
}

/*
* Sets variables for a test job on a given platform.
* Note that JAVA_BIN is set separately within buildenv/jenkins/common/test
*/
def set_test_variables() {
set_release()
set_jdk_folder()
TEST_DEPENDENCIES_JOB_NAME = VARIABLES.test_dependencies_job_name
}

/*
* Set TESTS_TARGETS, indicating the level of testing.
*/
Expand Down Expand Up @@ -599,15 +589,6 @@ def set_job_variables(job_type) {
set_artifactory_config()
add_pr_to_description()
break
case "pullRequest":
// set the node the pull request job would run on
set_node('build')
// set variables for a pull request job that builds an SDK
set_build_variables()
set_sdk_variables()
set_test_variables()
set_artifactory_config()
break
case "pipeline":
// set variables for a pipeline job
set_repos_variables()
Expand Down Expand Up @@ -648,27 +629,6 @@ def validate_arguments(ARGS) {
// exported as environment variables and it will overwrite the
// make SPEC variable set in the configure phase in build.build() method
SPEC = params.get(arg)

// TEMPORARILY MAP old spec names to new spec names for PR builds.
// This can be removed in #2836.
def REVERSE_SPEC_MAP = [
'aix_ppc-64_cmprssptrs' : 'ppc64_aix',
'linux_ppc-64_cmprssptrs_le' : 'ppc64le_linux',
'linux_390-64_cmprssptrs' : 's390x_linux',
'zos_390-64_cmprssptrs' : 's390x_zos',
'linux_x86-64_cmprssptrs' : 'x86-64_linux',
'linux_x86-64' : 'x86-64_linux_xl',
'linux_x86-64_cmprssptrs_cmake' : 'x86-64_linux_cm',
'win_x86' : 'x86-32_windows',
'win_x86-64_cmprssptrs' : 'x86-64_windows',
'osx_x86-64': 'x86-64_mac_xl',
'osx_x86-64_cmprssptrs' : 'x86-64_mac']

if (REVERSE_SPEC_MAP.keySet().contains(SPEC)) {
echo "Converting SPEC:'${SPEC}'..."
SPEC = REVERSE_SPEC_MAP[SPEC]
echo "to SPEC:'${SPEC}'"
}
}
}
}
Expand Down
30 changes: 2 additions & 28 deletions buildenv/jenkins/jobs/builds/Build-Test-Any-Platform
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,8 @@ timeout(time: 10, unit: 'HOURS') {
node(SETUP_LABEL) {
try{
checkout scm

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

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

variableFile.set_job_variables('build')
buildFile = load 'buildenv/jenkins/common/build'
} finally {
// disableDeferredWipeout also requires deleteDirs. See https://issues.jenkins-ci.org/browse/JENKINS-54225
Expand All @@ -51,25 +43,7 @@ timeout(time: 10, unit: 'HOURS') {
}
stage ('Queue') {
node("${NODE}") {
if (!run_tests()) {
// build or pull request compile only pipeline: compile, archive,
// clean up
buildFile.build_all()
} else {
checkout scm
testFile = load 'buildenv/jenkins/common/test'
cleanWs()
buildFile.build_pr()
testFile.test_all()
}
buildFile.build_all()
}
}
}

/*
* Returns true if TEST_TARGET Jenkins build parameter is set to any value
* except 'none', otherwise returns false.
*/
def run_tests() {
return (params.TEST_TARGET && (params.TEST_TARGET != 'none'))
}

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit a0819cf

Please sign in to comment.