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

Update jenkins files for 0.3 #693

Merged
merged 2 commits into from
Sep 9, 2020
Merged

Update jenkins files for 0.3 #693

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2eab5ff
Update jenkins files for branch-0.3, remove including databricks jar in
tgravescs Sep 9, 2020
171dbe5
Fix removal of -P
tgravescs Sep 9, 2020
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
2 changes: 1 addition & 1 deletion jenkins/Jenkinsfile.301.integration
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ pipeline {
parameters {
string(name: 'OVERWRITE_PARAMS', defaultValue: '',
description: 'parameters format XXX_VER=xxx;YYY_VER=yyy;')
string(name: 'REF', defaultValue: 'branch-0.2', description: 'Commit to build')
string(name: 'REF', defaultValue: 'branch-0.3', description: 'Commit to build')
}

environment {
Expand Down
2 changes: 1 addition & 1 deletion jenkins/Jenkinsfile.302.integration
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ pipeline {
parameters {
string(name: 'OVERWRITE_PARAMS', defaultValue: '',
description: 'parameters format XXX_VER=xxx;YYY_VER=yyy;')
string(name: 'REF', defaultValue: 'branch-0.2', description: 'Commit to build')
string(name: 'REF', defaultValue: 'branch-0.3', description: 'Commit to build')
}

environment {
Expand Down
2 changes: 1 addition & 1 deletion jenkins/Jenkinsfile.310.integration
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ pipeline {
parameters {
string(name: 'OVERWRITE_PARAMS', defaultValue: '',
description: 'parameters format XXX_VER=xxx;YYY_VER=yyy;')
string(name: 'REF', defaultValue: 'branch-0.2', description: 'Commit to build')
string(name: 'REF', defaultValue: 'branch-0.3', description: 'Commit to build')
}

environment {
Expand Down
6 changes: 3 additions & 3 deletions jenkins/Jenkinsfile.databricksnightly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,14 @@ pipeline {
choice(name: 'DEPLOY_TO', choices: ['Urm', 'Local'],
description: 'Where to deploy artifacts to')
string(name: 'DATABRICKS_VERSION',
defaultValue: '0.2.0-SNAPSHOT', description: 'Version to set')
defaultValue: '0.3.0-SNAPSHOT', description: 'Version to set')
string(name: 'CUDF_VERSION',
defaultValue: '0.15', description: 'Cudf version to use')
string(name: 'CUDA_VERSION',
defaultValue: 'cuda10-1', description: 'cuda version to use')
string(name: 'CLUSTER_ID',
defaultValue: '0617-140138-umiak14', description: 'databricks cluster id')
string(name: 'REF', defaultValue: 'branch-0.2', description: 'Commit to build')
defaultValue: '0909-141326-pawl52', description: 'databricks cluster id')
string(name: 'REF', defaultValue: 'branch-0.3', description: 'Commit to build')
}

environment {
Expand Down
2 changes: 1 addition & 1 deletion jenkins/Jenkinsfile.integration
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ pipeline {
description: 'parameters format XXX_VER=xxx;YYY_VER=yyy;')
string(name: 'CUDA_CLASSIFIER', defaultValue: 'cuda10-1',
description: '-Dclassifier=\n\n cuda10-1, cuda10-2, EMPTY as cuda10-1')
string(name: 'REF', defaultValue: 'branch-0.2', description: 'Commit to build')
string(name: 'REF', defaultValue: 'branch-0.3', description: 'Commit to build')
}

environment {
Expand Down
6 changes: 3 additions & 3 deletions jenkins/Jenkinsfile.nightly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ pipeline {
}

parameters {
string(name: 'REF', defaultValue: 'branch-0.2', description: 'Commit to build')
string(name: 'REF', defaultValue: 'branch-0.3', description: 'Commit to build')
}

environment {
Expand Down Expand Up @@ -83,9 +83,9 @@ pipeline {
always {
script {
if (currentBuild.currentResult == "SUCCESS") {
build(job: 'spark/rapids_integration-0.2-github',
build(job: 'spark/rapids_integration-0.3-github',
propagate: false,
parameters: [string(name: 'REF', value: 'branch-0.2')])
parameters: [string(name: 'REF', value: 'branch-0.3')])

slack("#rapidsai-spark-cicd", "Success", color: "#33CC33")
} else {
Expand Down
2 changes: 1 addition & 1 deletion jenkins/spark-premerge-build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ export PATH="$SPARK_HOME/bin:$SPARK_HOME/sbin:$PATH"
tar zxf $SPARK_HOME.tgz -C $ARTF_ROOT && \
rm -f $SPARK_HOME.tgz

mvn -U -B $MVN_URM_MIRROR '-Pinclude-databricks,!snapshot-shims' clean verify -Dpytest.TEST_TAGS=''
revans2 marked this conversation as resolved.
Show resolved Hide resolved
mvn -U -B $MVN_URM_MIRROR '-P!snapshot-shims' clean verify -Dpytest.TEST_TAGS=''
# Run the unit tests for other Spark versions but dont run full python integration tests
env -u SPARK_HOME mvn -U -B $MVN_URM_MIRROR -Pspark301tests,snapshot-shims test -Dpytest.TEST_TAGS=''
env -u SPARK_HOME mvn -U -B $MVN_URM_MIRROR -Pspark310tests,snapshot-shims test -Dpytest.TEST_TAGS=''
Expand Down
2 changes: 1 addition & 1 deletion jenkins/version-def.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ IFS=$PRE_IFS

CUDF_VER=${CUDF_VER:-"0.15"}
CUDA_CLASSIFIER=${CUDA_CLASSIFIER:-"cuda10-1"}
PROJECT_VER=${PROJECT_VER:-"0.2.0-SNAPSHOT"}
PROJECT_VER=${PROJECT_VER:-"0.3.0-SNAPSHOT"}
SPARK_VER=${SPARK_VER:-"3.0.0"}
SCALA_BINARY_VER=${SCALA_BINARY_VER:-"2.12"}
SERVER_ID=${SERVER_ID:-"snapshots"}
Expand Down