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.

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

Jenkinsfile changes #236

Merged
merged 1 commit into from
Jun 13, 2018
Merged
Changes from all commits
Commits
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: 4 additions & 4 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ def prBuilder(){

def releaseBuilder(){
def mvnArgs="-Pdeb -U -Phadoop-2.7 -Dhadoop.version=2.8.2 -Pkubernetes -Pyarn -Phive -Phive-thriftserver -Dpyspark -Dsparkr -DskipTests -Dgpg.skip=true -Dmaven.javadoc.skip=true"
def dockerMvnArgs="--name custom-spark --pip --tgz -Psparkr -Phadoop-2.7 -Phive -Phive-thriftserver -Pyarn -Pkubernetes -Dhadoop.version=2.8.2"
stage('Release Clean'){
// We need to check out the branch as a "symbolic ref" (i.e. not as an SHA1), otherwise
// Maven Release plugin won't be able to push to the branch.
Expand Down Expand Up @@ -85,10 +84,11 @@ def releaseBuilder(){
}
stage('Release Docker Image'){
def dockerVersion = "csd-2.3.1-${spark_version.split('-')[-1]}"
def repo = "628897842239.dkr.ecr.us-west-2.amazonaws.com"
sh """
dev/make-distribution.sh ${dockerMvnArgs} package
bin/docker-image-tool.sh -r 628897842239.dkr.ecr.us-west-2.amazonaws.com -t ${dockerVersion} build
bin/docker-image-tool.sh -r 628897842239.dkr.ecr.us-west-2.amazonaws.com -t ${dockerVersion} push
dev/make-distribution.sh --name custom-spark --pip --tgz -Psparkr -Phadoop-2.7 -Phive -Phive-thriftserver -Pyarn -Pkubernetes -Dhadoop.version=2.8.2
bin/docker-image-tool.sh -r ${repo} -t ${dockerVersion} build
bin/docker-image-tool.sh -r ${repo} -t ${dockerVersion} push
"""
}
}
Expand Down