Repository: bigtop Updated Branches: refs/heads/master 927bf4d1d -> 0357220a8
BIGTOP-1958. Upgrade default repositories and docker images to 1.0 Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/0357220a Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/0357220a Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/0357220a Branch: refs/heads/master Commit: 0357220a8ae26b4afac9235a3ae0dc2c676dfe8b Parents: 927bf4d Author: Evans Ye <[email protected]> Authored: Fri Aug 7 02:03:44 2015 +0800 Committer: Evans Ye <[email protected]> Committed: Fri Aug 7 15:31:18 2015 +0800 ---------------------------------------------------------------------- bigtop-deploy/puppet/manifests/site.pp | 4 ++-- bigtop-deploy/vm/vagrant-puppet-docker/vagrantconfig.yaml | 10 +++++----- .../vm/vagrant-puppet-docker/vagrantconfig_debian.yaml | 10 +++++----- bigtop-deploy/vm/vagrant-puppet-vm/vagrantconfig.yaml | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/0357220a/bigtop-deploy/puppet/manifests/site.pp ---------------------------------------------------------------------- diff --git a/bigtop-deploy/puppet/manifests/site.pp b/bigtop-deploy/puppet/manifests/site.pp index 2095434..8e8276c 100644 --- a/bigtop-deploy/puppet/manifests/site.pp +++ b/bigtop-deploy/puppet/manifests/site.pp @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -$default_yumrepo = "http://bigtop01.cloudera.org:8080/view/Releases/job/Bigtop-0.8.0/label=centos6/6/artifact/output/"; -$default_debrepo = "http://bigtop01.cloudera.org:8080/view/Releases/job/Bigtop-0.8.0/label=trusty/5/artifact/output/apt/"; +$default_yumrepo = "http://bigtop01.cloudera.org:8080/view/Releases/job/Bigtop-1.0.0-rpm/BUILD_ENVIRONMENTS=centos-6%2clabel=docker-slave-06/lastSuccessfulBuild/artifact/output/"; +$default_debrepo = "http://bigtop01.cloudera.org:8080/view/Releases/job/Bigtop-1.0.0-deb/BUILD_ENVIRONMENTS=debian-8%2clabel=docker-slave-07/lastSuccessfulBuild/artifact/output/apt/"; $jdk_package_name = hiera("bigtop::jdk_package_name", "jdk") stage {"pre": before => Stage["main"]} http://git-wip-us.apache.org/repos/asf/bigtop/blob/0357220a/bigtop-deploy/vm/vagrant-puppet-docker/vagrantconfig.yaml ---------------------------------------------------------------------- diff --git a/bigtop-deploy/vm/vagrant-puppet-docker/vagrantconfig.yaml b/bigtop-deploy/vm/vagrant-puppet-docker/vagrantconfig.yaml index 5eeeb45..d3f62c1 100644 --- a/bigtop-deploy/vm/vagrant-puppet-docker/vagrantconfig.yaml +++ b/bigtop-deploy/vm/vagrant-puppet-docker/vagrantconfig.yaml @@ -1,12 +1,12 @@ docker: - memory_size: "2048" - image: "bigtop/ssh:centos-6.4" + memory_size: "4096" + image: "bigtop/deploy:centos-6" boot2docker: - memory_size: "4196" - number_cpus: "2" + memory_size: "4096" + number_cpus: "1" -repo: "http://bigtop01.cloudera.org:8080/view/Releases/job/Bigtop-0.8.0/label=centos6/6/artifact/output/"; +repo: "http://bigtop01.cloudera.org:8080/view/Releases/job/Bigtop-1.0.0-rpm/BUILD_ENVIRONMENTS=centos-6%2clabel=docker-slave-06/lastSuccessfulBuild/artifact/output/"; distro: centos components: [hadoop, yarn] namenode_ui_port: "50070" http://git-wip-us.apache.org/repos/asf/bigtop/blob/0357220a/bigtop-deploy/vm/vagrant-puppet-docker/vagrantconfig_debian.yaml ---------------------------------------------------------------------- diff --git a/bigtop-deploy/vm/vagrant-puppet-docker/vagrantconfig_debian.yaml b/bigtop-deploy/vm/vagrant-puppet-docker/vagrantconfig_debian.yaml index 012fd36..2608120 100644 --- a/bigtop-deploy/vm/vagrant-puppet-docker/vagrantconfig_debian.yaml +++ b/bigtop-deploy/vm/vagrant-puppet-docker/vagrantconfig_debian.yaml @@ -1,12 +1,12 @@ docker: - memory_size: "2048" - image: "debian:jessie" + memory_size: "4096" + image: "bigtop/deploy:debian-8" boot2docker: - memory_size: "4196" - number_cpus: "2" + memory_size: "4096" + number_cpus: "1" -repo: "http://bigtop01.cloudera.org:8080/view/Releases/job/Bigtop-0.8.0/label=trusty/5/artifact/output/apt/"; +repo: "http://bigtop01.cloudera.org:8080/view/Releases/job/Bigtop-1.0.0-deb/BUILD_ENVIRONMENTS=debian-8%2clabel=docker-slave-07/lastSuccessfulBuild/artifact/output/apt/"; distro: debian components: [hadoop, yarn] namenode_ui_port: "50070" http://git-wip-us.apache.org/repos/asf/bigtop/blob/0357220a/bigtop-deploy/vm/vagrant-puppet-vm/vagrantconfig.yaml ---------------------------------------------------------------------- diff --git a/bigtop-deploy/vm/vagrant-puppet-vm/vagrantconfig.yaml b/bigtop-deploy/vm/vagrant-puppet-vm/vagrantconfig.yaml index fff0198..978486d 100644 --- a/bigtop-deploy/vm/vagrant-puppet-vm/vagrantconfig.yaml +++ b/bigtop-deploy/vm/vagrant-puppet-vm/vagrantconfig.yaml @@ -1,7 +1,7 @@ memory_size: 4096 number_cpus: 1 box: "puppetlabs/centos-6.6-64-nocm" -repo: "http://bigtop01.cloudera.org:8080/view/Releases/job/Bigtop-0.8.0/label=centos6/6/artifact/output/"; +repo: "http://bigtop01.cloudera.org:8080/view/Releases/job/Bigtop-1.0.0-rpm/BUILD_ENVIRONMENTS=centos-6%2clabel=docker-slave-06/lastSuccessfulBuild/artifact/output/"; num_instances: 1 distro: centos components: [hadoop, yarn]
