From 2a3641c8c91d558729891022d16187ec0c86a3d6 Mon Sep 17 00:00:00 2001 From: Liangcai Li Date: Tue, 30 Jun 2020 12:35:45 +0800 Subject: [PATCH 1/5] Update the credential IDs for public release --- jenkins/Jenkinsfile.release | 26 ++++++++------------------ jenkins/deploy.sh | 12 ++++++++++++ 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/jenkins/Jenkinsfile.release b/jenkins/Jenkinsfile.release index ebe89f1aff9..0352e757aec 100644 --- a/jenkins/Jenkinsfile.release +++ b/jenkins/Jenkinsfile.release @@ -21,16 +21,6 @@ * */ -def SERVERS_MAP = [ - Local: ' ', - Sonatype: 'https://oss.sonatype.org/service/local/staging/deploy/maven2' -] - -def SEC_IDS = [ - Local: ['local-gpg-passphrase', 'local-gpg-private-key', 'local-username-password'], - Sonatype: ['rapids-gpg-passphrase', 'rapids-gpg-private-key', 'sonatype-username-password'] -] - pipeline { agent { label 'vanilla||docker-deploy||docker-gpu' } @@ -41,9 +31,9 @@ pipeline { } parameters { - choice(name: 'DEPLOY_TO', choices: ['Sonatype'], - description: 'Where to deploy artifacts to') - string(name: 'REF', defaultValue: 'master', description: 'Commit to build') + string(name: 'DEPLOY_TO', defaultValue: 'https://oss.sonatype.org/service/local/staging/deploy/maven2', + description: 'The repo URL where to deploy the artifacts') + string(name: 'REF', defaultValue: 'main', description: 'Commit to build') } environment { @@ -78,10 +68,10 @@ pipeline { stage("Deploy") { environment { SERVER_ID='ossrh' - SERVER_URL="${SERVERS_MAP["$DEPLOY_TO"]}" - GPG_PASSPHRASE=credentials("${SEC_IDS["$DEPLOY_TO"][0]}") - GPG_FILE=credentials("${SEC_IDS["$DEPLOY_TO"][1]}") - SONATYPE=credentials("${SEC_IDS["$DEPLOY_TO"][2]}") + SERVER_URL="${DEPLOY_TO}" + GPG_PASSPHRASE=credentials('SPARK_RAPIDS_GPG_PASSPHRASE') + GPG_FILE=credentials('SPARK_RAPIDS_GPG_PRIVATE_KEY') + SONATYPE=credentials('SPARK_SONATYPE_USERPASS') GNUPGHOME="${WORKSPACE}/.gnupg" } steps { @@ -91,7 +81,7 @@ pipeline { sh 'rm -rf $GNUPGHOME' sh 'gpg --import $GPG_FILE' retry (3) { - sh "bash $JENKINS_ROOT/deploy.sh true false" + sh "bash $JENKINS_ROOT/deploy.sh true" } } } diff --git a/jenkins/deploy.sh b/jenkins/deploy.sh index f1d7f11e66f..e77f6195254 100755 --- a/jenkins/deploy.sh +++ b/jenkins/deploy.sh @@ -15,6 +15,18 @@ # limitations under the License. # +# Argument(s): +# SIGN_FILE: true/false, whether to sign the jar/pom file to de deployed +# DATABRICKS: true/fasle, whether deploying for databricks +# +# Used environment(s): +# SQL_PL: The path of module 'sql-plugin', relative to project root path. +# DIST_PL: The path of module 'dist', relative to project root path. +# SERVER_ID: The repository id for this deployment. +# SERVER_URL: The url where to deploy artifacts. +# GPG_PASSPHRASE: The passphrase used to sign files, only required when is true. +### + set -e SIGN_FILE=$1 DATABRICKS=$2 From 282b9e79228525b6681a66987e312a32310f2c9f Mon Sep 17 00:00:00 2001 From: Liangcai Li Date: Tue, 30 Jun 2020 14:32:15 +0800 Subject: [PATCH 2/5] Exclude all the '.asc' files for rat check --- dist/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dist/pom.xml b/dist/pom.xml index 31594026751..438ebbbcf8d 100644 --- a/dist/pom.xml +++ b/dist/pom.xml @@ -100,7 +100,7 @@ dependency-reduced-pom.xml - pom.xml.asc + *pom.xml.asc From e2027faf325a6dce694e927402faf1e4dc7fc9c6 Mon Sep 17 00:00:00 2001 From: Liangcai Li Date: Tue, 30 Jun 2020 15:11:28 +0800 Subject: [PATCH 3/5] Restore the second paramter for deploy script --- jenkins/Jenkinsfile.release | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkins/Jenkinsfile.release b/jenkins/Jenkinsfile.release index 0352e757aec..3a566130840 100644 --- a/jenkins/Jenkinsfile.release +++ b/jenkins/Jenkinsfile.release @@ -81,7 +81,7 @@ pipeline { sh 'rm -rf $GNUPGHOME' sh 'gpg --import $GPG_FILE' retry (3) { - sh "bash $JENKINS_ROOT/deploy.sh true" + sh "bash $JENKINS_ROOT/deploy.sh true false" } } } From 5d1fdecadf8f59b812f787bd92bc292c5a24c87a Mon Sep 17 00:00:00 2001 From: Liangcai Li Date: Tue, 30 Jun 2020 15:20:30 +0800 Subject: [PATCH 4/5] Make the directory '.zinc' before starting docker To avoid being created by docker as root user. --- jenkins/Jenkinsfile.release | 1 + 1 file changed, 1 insertion(+) diff --git a/jenkins/Jenkinsfile.release b/jenkins/Jenkinsfile.release index 3a566130840..aaca89d618e 100644 --- a/jenkins/Jenkinsfile.release +++ b/jenkins/Jenkinsfile.release @@ -56,6 +56,7 @@ pipeline { $DOCKER_CMD pull $IMAGE_NAME $DOCKER_CMD logout https://urm.nvidia.com """ + sh "mkdir -p ${HOME}/.zinc" docker.image("$IMAGE_NAME").inside("--runtime=nvidia -v ${HOME}/.m2:${HOME}/.m2:rw \ -v ${HOME}/.zinc:${HOME}/.zinc:rw \ -v /etc/passwd:/etc/passwd -v /etc/group:/etc/group") { From c0006568efa30b7b258c1144bec9eca2e82de487 Mon Sep 17 00:00:00 2001 From: Liangcai Li Date: Tue, 30 Jun 2020 17:37:35 +0800 Subject: [PATCH 5/5] Remove the first label for release --- jenkins/Jenkinsfile.release | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkins/Jenkinsfile.release b/jenkins/Jenkinsfile.release index aaca89d618e..cb1ef6d98b5 100644 --- a/jenkins/Jenkinsfile.release +++ b/jenkins/Jenkinsfile.release @@ -22,7 +22,7 @@ */ pipeline { - agent { label 'vanilla||docker-deploy||docker-gpu' } + agent { label 'docker-deploy||docker-gpu' } options { ansiColor('xterm')