You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@heron.apache.org by nw...@apache.org on 2019/01/04 07:53:01 UTC
[incubator-heron] branch master updated: Clean up
heron-client-install.sh (#3141)
This is an automated email from the ASF dual-hosted git repository.
nwang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-heron.git
The following commit(s) were added to refs/heads/master by this push:
new ed0cff8 Clean up heron-client-install.sh (#3141)
ed0cff8 is described below
commit ed0cff89cc078ce2f0a3f6ebefbfea4dc3563c6a
Author: Ning Wang <nw...@twitter.com>
AuthorDate: Thu Jan 3 23:52:56 2019 -0800
Clean up heron-client-install.sh (#3141)
* Clean up heron-client-install.sh
---
docker/dist/Dockerfile.dist.centos7 | 3 +--
docker/dist/Dockerfile.dist.ubuntu16.04 | 3 +--
docker/scripts/ci-docker.sh | 10 +++-------
.../src/python/local_test_runner/README | 2 +-
scripts/applatix/test.sh | 12 +++--------
scripts/applatix/testutils.sh | 12 +++--------
.../content/docs/developers/compiling/docker.md | 13 ++++++------
.../deployment/schedulers/aurora-local-setup.md | 7 +++----
website/content/docs/operators/heron-cli.md | 23 +++++++++++-----------
9 files changed, 33 insertions(+), 52 deletions(-)
diff --git a/docker/dist/Dockerfile.dist.centos7 b/docker/dist/Dockerfile.dist.centos7
index 140c5c3..0625068 100644
--- a/docker/dist/Dockerfile.dist.centos7
+++ b/docker/dist/Dockerfile.dist.centos7
@@ -40,8 +40,7 @@ RUN /heron/heron-install.sh
RUN mkdir -p /opt/heron && \
tar --strip-components=1 -m -zxvf /heron/heron-core.tar.gz -C /heron
-RUN rm -f /heron/heron-tools-install.sh
-RUN rm -f /heron/heron-client-install.sh
+RUN rm -f /heron/heron-install.sh
RUN rm -f /heron/heron-core.tar.gz
ENV HERON_HOME /heron/heron-core/
diff --git a/docker/dist/Dockerfile.dist.ubuntu16.04 b/docker/dist/Dockerfile.dist.ubuntu16.04
index ba4bc4d..3ec11da 100644
--- a/docker/dist/Dockerfile.dist.ubuntu16.04
+++ b/docker/dist/Dockerfile.dist.ubuntu16.04
@@ -39,8 +39,7 @@ RUN /heron/heron-install.sh
RUN tar --strip-components=1 -m -zxvf /heron/heron-core.tar.gz -C /heron
-RUN rm -f /heron/heron-tools-install.sh
-RUN rm -f /heron/heron-client-install.sh
+RUN rm -f /heron/heron-install.sh
RUN rm -f /heron/heron-core.tar.gz
ENV HERON_HOME /heron/heron-core/
diff --git a/docker/scripts/ci-docker.sh b/docker/scripts/ci-docker.sh
index 3341cf8..17e20f5 100755
--- a/docker/scripts/ci-docker.sh
+++ b/docker/scripts/ci-docker.sh
@@ -66,18 +66,14 @@ build_exec_image() {
setup_scratch_dir $SCRATCH_DIR
# need to copy artifacts locally
- TOOLS_FILE="$OUTPUT_DIRECTORY/heron-tools-install.sh"
- TOOLS_OUT_FILE="$SCRATCH_DIR/artifacts/heron-tools-install.sh"
+ INSTALL_FILE="$OUTPUT_DIRECTORY/heron-install.sh"
+ INSTALL_OUT_FILE="$SCRATCH_DIR/artifacts/heron-install.sh"
CORE_FILE="$OUTPUT_DIRECTORY/heron-core.tar.gz"
CORE_OUT_FILE="$SCRATCH_DIR/artifacts/heron-core.tar.gz"
- CLIENT_FILE="$OUTPUT_DIRECTORY/heron-client-install.sh"
- CLIENT_OUT_FILE="$SCRATCH_DIR/artifacts/heron-client-install.sh"
-
- cp $TOOLS_FILE $TOOLS_OUT_FILE
+ cp $INSTALL_FILE $INSTALL_OUT_FILE
cp $CORE_FILE $CORE_OUT_FILE
- cp $CLIENT_FILE $CLIENT_OUT_FILE
export HERON_VERSION
diff --git a/integration_test/src/python/local_test_runner/README b/integration_test/src/python/local_test_runner/README
index e728088..dbf1228 100644
--- a/integration_test/src/python/local_test_runner/README
+++ b/integration_test/src/python/local_test_runner/README
@@ -4,6 +4,6 @@ tuple to an output file and the two files are compared.
To run the tests:
- bazel run --config=darwin -- scripts/packages:heron-client-install.sh --user
+ bazel run --config=darwin -- scripts/packages:heron-install.sh --user
bazel build --config=darwin integration_test/src/...
./bazel-bin/integration_test/src/python/local_test_runner/local-test-runner
diff --git a/scripts/applatix/test.sh b/scripts/applatix/test.sh
index 23aae1f..78c023a 100755
--- a/scripts/applatix/test.sh
+++ b/scripts/applatix/test.sh
@@ -36,16 +36,10 @@ JAVA_INTEGRATION_TESTS_BIN="${HOME}/.herontests/lib/integration-tests.jar"
PYTHON_INTEGRATION_TESTS_BIN="${HOME}/.herontests/lib/heron_integ_topology.pex"
SCALA_INTEGRATION_TESTS_BIN="${HOME}/.herontests/lib/scala-integration-tests.jar"
-# install client
-T="heron client install"
+# install clients and tools
+T="heron clients/tools install"
start_timer "$T"
-python ${UTILS}/save-logs.py "heron_client_install.txt" ./heron-client-install.sh --user
-end_timer "$T"
-
-# install tools
-T="heron tools install"
-start_timer "$T"
-python ${UTILS}/save-logs.py "heron_tools_install.txt" ./heron-tools-install.sh --user
+python ${UTILS}/save-logs.py "heron_install.txt" ./heron-install.sh --user
end_timer "$T"
# install tests
diff --git a/scripts/applatix/testutils.sh b/scripts/applatix/testutils.sh
index 6107847..f526f2f 100755
--- a/scripts/applatix/testutils.sh
+++ b/scripts/applatix/testutils.sh
@@ -31,16 +31,10 @@ echo "Using $PLATFORM platform"
# include HOME directory bin in PATH for heron cli, tools and tests
export PATH=${HOME}/bin:$PATH
-# install client
-T="heron client install"
+# install clients and tools
+T="heron clients/tools install"
start_timer "$T"
-python ${UTILS}/save-logs.py "heron_client_install.txt" ./heron-client-install.sh --user
-end_timer "$T"
-
-# install tools
-T="heron tools install"
-start_timer "$T"
-python ${UTILS}/save-logs.py "heron_tools_install.txt" ./heron-tools-install.sh --user
+python ${UTILS}/save-logs.py "heron_install.txt" ./heron-install.sh --user
end_timer "$T"
# install tests
diff --git a/website/content/docs/developers/compiling/docker.md b/website/content/docs/developers/compiling/docker.md
index 4ac32e8..8a3c6de 100644
--- a/website/content/docs/developers/compiling/docker.md
+++ b/website/content/docs/developers/compiling/docker.md
@@ -64,7 +64,7 @@ The following arguments are required:
Here's an example usage:
```bash
-$ docker/build-artifacts.sh ubuntu14.04 0.12.0 ~/heron-release
+$ docker/scripts/build-artifacts.sh ubuntu14.04 0.12.0 ~/heron-release
```
This will build a Docker container specific to Ubuntu 14.04, create a source
@@ -87,13 +87,12 @@ of the generated artifacts:
```bash
$ ls ~/heron-release
-heron-api-0.12.0-ubuntu14.04.tar.gz
-heron-client-0.12.0-ubuntu14.04.tar.gz
+heron-0.12.0-ubuntu14.04.tar
+heron-0.12.0-ubuntu14.04.tar.gz
+heron-core-0.12.0-ubuntu14.04.tar.gz
+heron-install-0.12.0-ubuntu14.04.sh
+heron-layer-0.12.0-ubuntu14.04.tar
heron-tools-0.12.0-ubuntu14.04.tar.gz
-heron-client-install-0.12.0-ubuntu.sh
-heron-tools-install-0.12.0-ubuntu.sh
-heron-api-install-0.12.0-ubuntu.sh
-heron-core-0.12.0-ubuntu.tar.gz
```
## Contributing New Environments
diff --git a/website/content/docs/operators/deployment/schedulers/aurora-local-setup.md b/website/content/docs/operators/deployment/schedulers/aurora-local-setup.md
index 49048d9..fa79c05 100644
--- a/website/content/docs/operators/deployment/schedulers/aurora-local-setup.md
+++ b/website/content/docs/operators/deployment/schedulers/aurora-local-setup.md
@@ -79,8 +79,7 @@ https://github.com/apache/incubator-heron/releases/tag/{{% heronVersion %}}
For example for the {{% heronVersion %}} release the files you need to download For Ubuntu will be the following.
-* `heron-client-install-{{% heronVersion %}}-ubuntu.sh`
-* `heron-tools-install-{{% heronVersion %}}-ubuntu.sh`
+* `heron-install-{{% heronVersion %}}-ubuntu.sh`
Optionally - You want need the following for the steps in the blog post
@@ -91,8 +90,8 @@ Optionally - You want need the following for the steps in the blog post
```bash
-$ chmod +x heron-client-install-VERSION-PLATFORM.sh
-$ ./heron-client-install-VERSION-PLATFORM.sh --user
+$ chmod +x heron-install-VERSION-PLATFORM.sh
+$ ./heron-install-VERSION-PLATFORM.sh --user
Heron client installer
----------------------
diff --git a/website/content/docs/operators/heron-cli.md b/website/content/docs/operators/heron-cli.md
index b13e6dc..64cee82 100644
--- a/website/content/docs/operators/heron-cli.md
+++ b/website/content/docs/operators/heron-cli.md
@@ -7,14 +7,14 @@ The **Heron CLI** us used to to manage every aspect of the
## Deploying the `heron` CLI Executable
-To use `heron` CLI, download the `heron-client-install` for your platfrom from
+To use `heron` CLI, download the `heron-install` for your platfrom from
[release binaries](https://github.com/apache/incubator-heron/releases) and run the
-installation script. For example, if you have downloaded the version `0.13.5`,
-you invoke the installation script as follows:
+installation script. For example, if you have downloaded the version `0.17.6`,
+you invoke the installation script as follows
```bash
-$ chmod +x heron-client-install-0.13.5-darwin.sh
-$ ./heron-client-install-0.13.5-darwin.sh --user
+$ chmod +x heron-install-0.17.6-darwin.sh
+$ ./heron-install-0.17.6-darwin.sh --user
Heron client installer
----------------------
@@ -359,10 +359,11 @@ using:
```bash
$ heron version
-heron.build.version : 0.13.5
-heron.build.time : Wed May 11 23:49:00 PDT 2016
-heron.build.timestamp : 1463035740000
-heron.build.host : mbp-machine
-heron.build.user : userwhobuilt
-INFO: Elapsed time: 0.000s.
+heron.build.version : '0.17.6'
+heron.build.time : Wed Feb 28 12:08:52 PST 2018
+heron.build.timestamp : 1519848532000
+heron.build.host : ci-server-01
+heron.build.user : release-agent1
+heron.build.git.revision : ada6052f6f841e27416b9f9bb4be73183d5a8cd8
+heron.build.git.status : Clean
```