Repository: brooklyn-dist
Updated Branches:
  refs/heads/master 77cad55a6 -> 2eb72322a


Updates to the Vagrantfile for making releases

Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/a717767c
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/a717767c
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/a717767c

Branch: refs/heads/master
Commit: a717767c8987674dcff0c610890d6cf634bf23c4
Parents: f2c7112
Author: Richard Downer <rich...@apache.org>
Authored: Wed Jun 29 16:53:27 2016 +0100
Committer: Richard Downer <rich...@apache.org>
Committed: Tue Aug 9 16:28:58 2016 +0100

----------------------------------------------------------------------
 release/Vagrantfile                  | 13 +++++++------
 release/clone-and-configure-repos.sh | 11 +++--------
 release/gpg-agent.conf               |  2 +-
 3 files changed, 11 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/a717767c/release/Vagrantfile
----------------------------------------------------------------------
diff --git a/release/Vagrantfile b/release/Vagrantfile
index bbd0f91..a8b6e71 100644
--- a/release/Vagrantfile
+++ b/release/Vagrantfile
@@ -28,8 +28,7 @@
 # you're doing.
 Vagrant.configure(2) do |config|
 
-  # Base on Ubuntu 14.04 LTS
-  config.vm.box = "ubuntu/trusty64"
+  config.vm.box = "ubuntu/wily64"
 
   # Provider-specific configuration so you can fine-tune various
   # backing providers for Vagrant. These expose provider-specific options.
@@ -50,9 +49,9 @@ Vagrant.configure(2) do |config|
 
     aws.region_config "eu-west-1" do |region|
       region.ami = "ami-f95ef58a"
-      region.subnet_id = "subnet-56d3f922"
+      region.subnet_id = "subnet-56d3f922" # part of vpc-d9b5bebb
       region.associate_public_ip = true
-      region.security_groups = [ 'sg-ac8f86c8' ]
+      region.security_groups = [ 'sg-285d4b4a' ]
     end
 
     override.ssh.username = "ubuntu"
@@ -69,11 +68,12 @@ Vagrant.configure(2) do |config|
   # Update the VM, install Java and Maven, enable 
passwordless-ssh-to-localhost,
   # clone the canonical repository
   config.vm.provision "shell", inline: <<-SHELL
+    eval $( /vagrant/vagrant-activate-proxy.sh )
     NORMALUSER=$( getent passwd 1000 | cut -f1 -d: )
-    add-apt-repository -y ppa:mwhudson/go16-trusty
+    add-apt-repository -y ppa:ubuntu-lxc/lxd-stable
     apt-get update
     apt-get upgrade -y
-    apt-get install -y default-jdk git subversion xmlstarlet zip unzip 
language-pack-en vim-nox gnupg2 gnupg-agent pinentry-curses golang-1.6 rpm
+    apt-get install -y default-jdk git subversion xmlstarlet zip unzip 
language-pack-en vim-nox gnupg2 gnupg-agent pinentry-curses golang rpm mmv
     mkdir -p /opt
     curl 
http://archive.apache.org/dist/maven/maven-3/3.1.1/binaries/apache-maven-3.1.1-bin.tar.gz
 | tar xz -C /opt
     ln -s /opt/apache-maven-3.1.1/bin/mvn /usr/local/bin
@@ -83,6 +83,7 @@ Vagrant.configure(2) do |config|
     eval chmod -R go= ~${NORMALUSER}/.gnupg
     cat /etc/ssh/ssh_host_*_key.pub | awk '{print "localhost,127.0.0.1 "$0}' 
>> /etc/ssh/ssh_known_hosts
     su -c 'ssh-keygen -t rsa -b 2048 -N "" -f ~/.ssh/id_rsa; cat ~/.ssh/*.pub 
>> ~/.ssh/authorized_keys' $NORMALUSER
+    su -c 'git config --global credential.helper cache' $NORMALUSER
     su -c '/vagrant/clone-and-configure-repos.sh' $NORMALUSER
   SHELL
 end

http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/a717767c/release/clone-and-configure-repos.sh
----------------------------------------------------------------------
diff --git a/release/clone-and-configure-repos.sh 
b/release/clone-and-configure-repos.sh
index 3ee745c..7a074fc 100755
--- a/release/clone-and-configure-repos.sh
+++ b/release/clone-and-configure-repos.sh
@@ -22,23 +22,17 @@ set -e
 set -x
 
 # Do the basics
-git clone http://github.com/apache/brooklyn/
+git clone -o apache-git https://git-wip-us.apache.org/repos/asf/brooklyn
 cd brooklyn
 git submodule init
 git submodule update --remote --merge --recursive
 
-# Replace the origin - was GitHub, needs to be Apache canonical
-git remote add apache-git https://git-wip-us.apache.org/repos/asf/brooklyn
+# .gitmodules sets the submodules up from GitHub. Replace the origin with 
Apache canonical
 git submodule foreach 'git remote add apache-git 
https://git-wip-us.apache.org/repos/asf/${name}'
-git fetch apache-git
 git submodule foreach 'git fetch apache-git'
-git checkout master
 git submodule foreach 'git checkout master'
-git branch --set-upstream-to apache-git/master master
 git submodule foreach 'git branch --set-upstream-to apache-git/master master'
-git reset --hard apache-git/master
 git submodule foreach 'git reset --hard apache-git/master'
-git remote remove origin
 git submodule foreach 'git remote remove origin'
 
 # Final check we are up to date
@@ -46,5 +40,6 @@ git pull
 git submodule update --remote --merge --recursive
 
 # And also the location for publishing RC artifacts
+svn co --depth=immediates https://dist.apache.org/repos/dist/release/brooklyn 
~/apache-dist-release-brooklyn
 svn co --depth=immediates https://dist.apache.org/repos/dist/dev/brooklyn 
~/apache-dist-dev-brooklyn
 echo "export APACHE_DIST_SVN_DIR=$HOME/apache-dist-dev-brooklyn" >> ~/.profile

http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/a717767c/release/gpg-agent.conf
----------------------------------------------------------------------
diff --git a/release/gpg-agent.conf b/release/gpg-agent.conf
index 313a4a4..245ac58 100644
--- a/release/gpg-agent.conf
+++ b/release/gpg-agent.conf
@@ -1,2 +1,2 @@
-default-cache-ttl 1800
+default-cache-ttl 3600
 max-cache-ttl 14400

Reply via email to