Skip to content

Commit

Permalink
BIGTOP-3200. Bugfix Integration test framework 2.0 and documentation (#…
Browse files Browse the repository at this point in the history
  • Loading branch information
evans-ye committed Mar 29, 2019
1 parent d9d3f89 commit 8d6d6d3
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 29 deletions.
26 changes: 1 addition & 25 deletions README.md
Expand Up @@ -59,30 +59,6 @@ There are lots of ways to contribute. People with different expertise can help

Also, opening [JIRA's](https://issues.apache.org/jira/browse/BIGTOP) and getting started by posting on the mailing list is helpful.

CTR model
=========

Bigtop supports Commit-Then-Review model of development. The following
rules will be used for the CTR process:
* a committer can go ahead and commit the patch without mandatory review if
felt confident in its quality (e.g. reasonable testing has been done
locally; all compilations pass; RAT check is passed; the patch follows
coding guidelines)
* a committer is encouraged to seek peer-review and/or advice before hand if
there're doubts in the approach taken, design decision, or implementation
details
* a committer should keep an eye on the official CI builds at
https://ci.bigtop.apache.org/view/Packages/job/Bigtop-trunk-packages/ (Bigtop-trunk-packages builds)
to make sure that committed changes haven't break anything. In
which case the committer should take a timely effort to resolve the issues
and unblock the others in the community
* any non-document patch is required to be opened for at least 24 hours for
community feedback before it gets committed unless it has an explicit +1
from another committer
* any non-document patch needs to address all the comment and reach consensus
before it gets committed without a +1 from other committers
* there's no changes in the JIRA process, except as specified above

What do people use Apache Bigtop for?
==============================

Expand Down Expand Up @@ -273,7 +249,7 @@ And `base_version` is to overwrite:
Example for Kafka:

```
./gradlew kafka-pkg -Pgit_repo=https://github.com/apache/kafka.git -Pgit_ref=1.1 -Pgit_sha1=4dae083af486eaedd27c69c973c74605bffd416b -Pbase_version=1.1.1 --info
./gradlew kafka-pkg-ind -Pgit_repo=https://github.com/apache/kafka.git -Pgit_ref=trunk -Pgit_commit_hash=dc0601a1c604bea3f426ed25b6c20176ff444079 -Pbase_version=2.2.0
```

You can mix both ways to build from Git, but command line always overwrites `bigtop.bom`.
Expand Down
1 change: 1 addition & 0 deletions bigtop-ci/build.sh
Expand Up @@ -86,6 +86,7 @@ RESULT=$?

# save result
mkdir -p output
docker cp $CONTAINER_ID:/bigtop/build .
docker cp $CONTAINER_ID:/bigtop/output .
docker rm -f $CONTAINER_ID

Expand Down
6 changes: 3 additions & 3 deletions build.gradle
Expand Up @@ -268,7 +268,7 @@ Properties:
-Pnexus=[NEXUS_URL] (NEXUS_URL is optional)
-POS=[centos-7|fedora-26|debian-9|ubuntu-16.04|opensuse-42.3]
-Pprefix=[trunk|1.2.1|1.2.0|1.1.0|...]
-Prepo=[REPO_URL]
-Prepository=[REPO_URL]
-Prun_smoke_tests (run test components defined in config file)
-Psmoke_tests=[COMPONENTS]
-Pstack=[COMPONENTS]
Expand Down Expand Up @@ -320,9 +320,9 @@ Specify custom configuration file:
command.add('--image')
command.add("${image}")
}
if (project.hasProperty("repo")) {
if (project.hasProperty("repository")) {
command.add('--repo')
command.add("${repo}")
command.add("${repository}")
}
if (project.hasProperty("memory")) {
command.add('--memory')
Expand Down
2 changes: 1 addition & 1 deletion provisioner/docker/docker-hadoop.sh
Expand Up @@ -173,7 +173,7 @@ smoke-tests() {
destroy() {
if [ -z ${PROVISION_ID+x} ]; then
echo "No cluster exists!"
exit 1
exit 0
fi
docker exec ${NODES[0]} bash -c "umount /etc/hosts; rm -f /etc/hosts"
if [ -n "$PROVISION_ID" ]; then
Expand Down

0 comments on commit 8d6d6d3

Please sign in to comment.