Update jenkins script as per changes in Makefile

d2iq-archive · Jun 15, 2020 · a79ffd3 · a79ffd3
1 parent 2a5a53a
commit a79ffd3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/bin/jenkins-dist-publish.sh b/bin/jenkins-dist-publish.sh
@@ -61,12 +61,12 @@ function publish_dists() {
 # $2: hadoop version (e.g. "2.6")
 function publish_dist() {
     SPARK_DIR=${SPARK_DIR} \
-        make prod-dist -e SCALA_VERSION="$1" HADOOP_VERSION="$2"
+        make spark-dist-build -e SCALA_VERSION="$1" HADOOP_VERSION="$2"
     rename_dist
     AWS_ACCESS_KEY_ID=${PROD_AWS_ACCESS_KEY_ID} \
-        AWS_SECRET_ACCESS_KEY=${PROD_AWS_SECRET_ACCESS_KEY} \
-        S3_URL="s3://${PROD_S3_BUCKET}/${PROD_S3_PREFIX}/" \
-    store_distributions
+    AWS_SECRET_ACCESS_KEY=${PROD_AWS_SECRET_ACCESS_KEY} \
+    S3_URL="s3://${PROD_S3_BUCKET}/${PROD_S3_PREFIX}/" \
+        store_distributions
     make clean-dist
 }
 

diff --git a/bin/jenkins-package-publish.sh b/bin/jenkins-package-publish.sh
@@ -35,7 +35,7 @@ function publish_docker_images() {
 function make_universe() {
     DOCKER_VERSION=$(docker_version $(default_scala_version) $(default_hadoop_version))
 
-    make manifest-dist # use default manifest spark
+    make spark-dist-download # use default manifest spark dist
     make stub-universe-url -e DOCKER_DIST_IMAGE=${DOCKER_DIST_IMAGE}:${DOCKER_VERSION}
 }