Merge "Step 1: Create git macro to download integration/distribution"

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index 35383ac61f91797e51b0b7230ba91e743d6f7ee1..ff084abc2ec21bddde80d6479a92ef6040881a5d 100644 (file)
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -301,7 +301,7 @@
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'site:deploy -Dstream=master'
+        goals: 'site:site site:deploy -Dstream=master'
         maven-opts: '-Xmx1024m'
         settings: '{autorelease-settings}'
         global-settings: '{odl-global-settings}'

diff --git a/vagrant/baseline/system_reseal.sh b/vagrant/baseline/system_reseal.sh
index 95811fa7899c6370c0042183dfba9a3048856ae7..0b2fb8d44de8e920e0a72e53c8acc8d972e0af6b 100644 (file)
--- a/vagrant/baseline/system_reseal.sh
+++ b/vagrant/baseline/system_reseal.sh
@@ -18,6 +18,9 @@ rm -rf /etc/Pegasus/*.cnf /etc/Pegasus/*.crt /etc/Pegasus/*.csr /etc/Pegasus/*.p
 
 rm -rf ~/.viminfo /etc/ssh/ssh*key*
 
+# kill any cloud-init related bits
+rm -rf /var/lib/cloud/*
+
 echo "********************************************"
 echo "*   PLEASE SNAPSHOT IMAGE AT THIS TIME     *"
 echo "********************************************"