[10/16] brooklyn-dist git commit: Release Vagrantfile: new git + svn checkouts

[he...@apache.org]

Release Vagrantfile: new git + svn checkouts

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

Branch: refs/heads/master
Commit: 0586975e5192a5ea19638ff9c15b9e2c2a945a8c
Parents: 8f78734
Author: Richard Downer <ri...@apache.org>
Authored: Wed Mar 16 16:46:47 2016 +0000
Committer: Richard Downer <ri...@apache.org>
Committed: Wed Mar 16 16:46:47 2016 +0000

----------------------------------------------------------------------
 release/Vagrantfile                  |  4 +--
 release/clone-and-configure-repos.sh | 50 +++++++++++++++++++++++++++++++
 2 files changed, 52 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/0586975e/release/Vagrantfile
----------------------------------------------------------------------
diff --git a/release/Vagrantfile b/release/Vagrantfile
index 9256f91..80aade0 100644
--- a/release/Vagrantfile
+++ b/release/Vagrantfile
@@ -52,8 +52,8 @@ Vagrant.configure(2) do |config|
   config.vm.provision "shell", inline: <<-SHELL
     apt-get update
     apt-get upgrade -y
-    apt-get install -y default-jdk maven git xmlstarlet zip unzip language-pack-en vim-nox gnupg2 gnupg-agent pinentry-curses
     wget -q -O /tmp/artifactory.zip http://bit.ly/Hqv9aj
+    apt-get install -y default-jdk maven git subversion xmlstarlet zip unzip language-pack-en vim-nox gnupg2 gnupg-agent pinentry-curses
     mkdir -p /opt
     unzip /tmp/artifactory.zip -d /opt
     sudo sed -i -e '/Connector port=/ s/=\".*\"/=\"'"8008"'\"/' /opt/artifactory*/tomcat/conf/server.xml
@@ -64,6 +64,6 @@ Vagrant.configure(2) do |config|
     mount -ttmpfs -osize=3g none /work
     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' vagrant
-    su -c 'git clone https://git-wip-us.apache.org/repos/asf/incubator-brooklyn.git apache-brooklyn-git' vagrant
+    su -c '/vagrant/clone-and-configure-repos.sh' vagrant
   SHELL
 end

http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/0586975e/release/clone-and-configure-repos.sh
----------------------------------------------------------------------
diff --git a/release/clone-and-configure-repos.sh b/release/clone-and-configure-repos.sh
new file mode 100755
index 0000000..3ee745c
--- /dev/null
+++ b/release/clone-and-configure-repos.sh
@@ -0,0 +1,50 @@
+#!/bin/bash
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+set -e
+set -x
+
+# Do the basics
+git clone http://github.com/apache/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
+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
+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/dev/brooklyn ~/apache-dist-dev-brooklyn
+echo "export APACHE_DIST_SVN_DIR=$HOME/apache-dist-dev-brooklyn" >> ~/.profile