You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by mi...@apache.org on 2017/01/16 02:03:45 UTC
zeppelin git commit: [BUILD] Update release script
Repository: zeppelin
Updated Branches:
refs/heads/master 41f9fd921 -> f8c11d15f
[BUILD] Update release script
### What is this PR for?
* Change hadoop profile from `hadoop-2.4` to `hadoop-2.6`
* Use `SCALA_VERSION` variable instead of hardcoding
* Specify projects to be built for netinst package instead of excluding unnecessary projects.
### What type of PR is it?
Build
### What is the Jira issue?
### How should this be tested?
Outline the steps to test the PR here.
### Screenshots (if appropriate)
### Questions:
* Does the licenses files need update? no
* Is there breaking changes for older versions? no
* Does this needs documentation? no
Author: Mina Lee <mi...@apache.org>
Closes #1890 from minahlee/update/release_script and squashes the following commits:
a97b5fe [Mina Lee] Remove one r interpreter profile as only one will take effect
1479d26 [Mina Lee] Use scala variable instead of hardcoding Specify project to build for net-inst package instead of adding exluding projects everytime zeppelin have new interpreter
da9080a [Mina Lee] Update hadoop profile from 2.4 to 2.6
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/f8c11d15
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/f8c11d15
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/f8c11d15
Branch: refs/heads/master
Commit: f8c11d15f4378523922c76a892a755a60e4a187b
Parents: 41f9fd9
Author: Mina Lee <mi...@apache.org>
Authored: Fri Jan 13 11:39:42 2017 +0900
Committer: Mina Lee <mi...@apache.org>
Committed: Mon Jan 16 11:03:36 2017 +0900
----------------------------------------------------------------------
dev/create_release.sh | 7 ++++---
dev/publish_release.sh | 2 +-
2 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/f8c11d15/dev/create_release.sh
----------------------------------------------------------------------
diff --git a/dev/create_release.sh b/dev/create_release.sh
index ece5863..9b0b231 100755
--- a/dev/create_release.sh
+++ b/dev/create_release.sh
@@ -42,6 +42,7 @@ done
RELEASE_VERSION="$1"
GIT_TAG="$2"
+SCALA_VERSION="2.11"
function build_docker_base() {
# build base image
@@ -80,7 +81,7 @@ function make_binary_release() {
cp -r "${WORKING_DIR}/zeppelin" "${WORKING_DIR}/zeppelin-${RELEASE_VERSION}-bin-${BIN_RELEASE_NAME}"
cd "${WORKING_DIR}/zeppelin-${RELEASE_VERSION}-bin-${BIN_RELEASE_NAME}"
- ./dev/change_scala_version.sh 2.11
+ ./dev/change_scala_version.sh "${SCALA_VERSION}"
echo "mvn clean package -Pbuild-distr -DskipTests ${BUILD_FLAGS}"
mvn clean package -Pbuild-distr -DskipTests ${BUILD_FLAGS}
if [[ $? -ne 0 ]]; then
@@ -123,8 +124,8 @@ function make_binary_release() {
build_docker_base
git_clone
make_source_package
-make_binary_release all "-Pspark-2.0 -Phadoop-2.4 -Pyarn -Ppyspark -Psparkr -Pr -Pscala-2.11"
-make_binary_release netinst "-Pspark-2.0 -Phadoop-2.4 -Pyarn -Ppyspark -Psparkr -Pr -Pscala-2.11 -pl !alluxio,!angular,!cassandra,!elasticsearch,!file,!flink,!hbase,!ignite,!jdbc,!kylin,!lens,!livy,!markdown,!postgresql,!python,!shell,!bigquery"
+make_binary_release all "-Pspark-2.0 -Phadoop-2.6 -Pyarn -Ppyspark -Psparkr -Pscala-${SCALA_VERSION}"
+make_binary_release netinst "-Pspark-2.0 -Phadoop-2.6 -Pyarn -Ppyspark -Psparkr -Pscala-${SCALA_VERSION} -pl zeppelin-interpreter,zeppelin-zengine,:zeppelin-display_${SCALA_VERSION},:zeppelin-spark-dependencies_${SCALA_VERSION},:zeppelin-spark_${SCALA_VERSION},zeppelin-web,zeppelin-server,zeppelin-distribution -am"
# remove non release files and dirs
rm -rf "${WORKING_DIR}/zeppelin"
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/f8c11d15/dev/publish_release.sh
----------------------------------------------------------------------
diff --git a/dev/publish_release.sh b/dev/publish_release.sh
index f945f6e..7b99f39 100755
--- a/dev/publish_release.sh
+++ b/dev/publish_release.sh
@@ -44,7 +44,7 @@ NC='\033[0m' # No Color
RELEASE_VERSION="$1"
GIT_TAG="$2"
-PUBLISH_PROFILES="-Ppublish-distr -Pspark-2.0 -Phadoop-2.4 -Pyarn -Ppyspark -Psparkr -Pr"
+PUBLISH_PROFILES="-Ppublish-distr -Pspark-2.0 -Phadoop-2.6 -Pyarn -Ppyspark -Psparkr -Pr"
PROJECT_OPTIONS="-pl !zeppelin-distribution"
NEXUS_STAGING="https://repository.apache.org/service/local/staging"
NEXUS_PROFILE="153446d1ac37c4"