[Fusionforge-commits] FusionForge branch master updated. 049d4dfc30a66ef8929ea8e619ab2d4cf0100943

Sylvain Beucler beuc-inria at fusionforge.org
Mon Mar 10 17:45:59 CET 2014


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".

The branch, master has been updated
       via  049d4dfc30a66ef8929ea8e619ab2d4cf0100943 (commit)
      from  2bc3c5b0782ae1ff982f56c75186f5da56bacb4a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 049d4dfc30a66ef8929ea8e619ab2d4cf0100943
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Mon Mar 10 17:45:19 2014 +0100

    VM: more fixes

diff --git a/vm/Vagrantfile b/vm/Vagrantfile-sample
similarity index 97%
rename from vm/Vagrantfile
rename to vm/Vagrantfile-sample
index 6aaea94..52890ac 100644
--- a/vm/Vagrantfile
+++ b/vm/Vagrantfile-sample
@@ -10,10 +10,11 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   # please see the online documentation at vagrantup.com.
 
   # Every Vagrant virtual environment requires a box to build off of.
-  config.vm.box = "fusionforge-dev"
+  config.vm.box = "fusionforge-dev-debian"
 
   # The url from where the 'config.vm.box' box will be fetched if it
   # doesn't already exist on the user's system.
+  #config.vm.box_url = "packer/fusionforge-dev-debian.box"
   config.vm.box_url = "http://fusionforge.fusionforge.org/sandbox/fusionforge-dev-debian.box"
 
   # Create a forwarded port mapping which allows access to a specific port
@@ -47,7 +48,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   #
   config.vm.provider :virtualbox do |vb|
   #   # Don't boot with headless mode
-  #  vb.gui = true
+      vb.gui = true
   #
   #   # Use VBoxManage to customize the VM. For example to change memory:
   #   vb.customize ["modifyvm", :id, "--memory", "1024"]
diff --git a/vm/packer/file/Desktop/build-and-install.desktop b/vm/packer/file/Desktop/build-and-install.desktop
index 362af72..d783e84 100644
--- a/vm/packer/file/Desktop/build-and-install.desktop
+++ b/vm/packer/file/Desktop/build-and-install.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Encoding=UTF-8
 Name=Build + inst
-Exec=sh -c "/root/fusionforge/tools/VM-scripts/build.sh ; /root/fusionforge/tools/VM-scripts/install.sh ; echo Press Enter... ; read i"
+Exec=sh -c "/usr/src/fusionforge/tools/VM-scripts/build.sh ; /usr/src/fusionforge/tools/VM-scripts/install.sh ; echo Press Enter... ; read i"
 Terminal=true
 Type=Application
diff --git a/vm/packer/file/Desktop/run-testsuite.desktop b/vm/packer/file/Desktop/run-testsuite.desktop
index a4961dd..99d59ed 100644
--- a/vm/packer/file/Desktop/run-testsuite.desktop
+++ b/vm/packer/file/Desktop/run-testsuite.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Encoding=UTF-8
 Name=Run testsuite
-Exec=sh -c "/root/fusionforge/tools/VM-scripts/run-testsuite.sh ; echo Press Enter... ; read i"
+Exec=sh -c "/usr/src/fusionforge/tools/VM-scripts/run-testsuite.sh ; echo Press Enter... ; read i"
 Terminal=true
 Type=Application
diff --git a/vm/packer/fusionforge-dev-centos.json b/vm/packer/fusionforge-dev-centos.json
index 05adee2..f651f5d 100644
--- a/vm/packer/fusionforge-dev-centos.json
+++ b/vm/packer/fusionforge-dev-centos.json
@@ -1,6 +1,11 @@
 {
   "provisioners": [
     {
+      "type": "file",
+      "source": "file/bashrc",
+      "destination": "/root/.bashrc"
+    },
+    {
       "type": "shell",
       "scripts": [
         "scripts/base-centos.sh",
diff --git a/vm/packer/scripts/cleanup-debian.sh b/vm/packer/scripts/cleanup-debian.sh
index 5ab6d2b..883354b 100755
--- a/vm/packer/scripts/cleanup-debian.sh
+++ b/vm/packer/scripts/cleanup-debian.sh
@@ -1,17 +1,11 @@
 #!/bin/bash
 
 # Clean up
-apt-get -y --force-yes remove linux-headers-$(uname -r) build-essential
 apt-get -y --force-yes autoremove
 apt-get -y --force-yes purge $(dpkg --list |grep '^rc' |awk '{print $2}')
 apt-get -y --force-yes purge $(dpkg --list |egrep 'linux-image-[0-9]' |awk '{print $3,$2}' |sort -nr |tail -n +2 |grep -v $(uname -r) |awk '{ print $2}')
 apt-get -y --force-yes clean
 
-# Cleanup Virtualbox
-VBOX_VERSION=$(cat .vbox_version)
-VBOX_ISO=VBoxGuestAdditions_$VBOX_VERSION.iso
-rm $VBOX_ISO
-
 # Removing leftover leases and persistent rules
 echo "cleaning up dhcp leases"
 rm /var/lib/dhcp/*
diff --git a/vm/packer/scripts/vagrant.sh b/vm/packer/scripts/vagrant.sh
index 99c26ad..43aea07 100755
--- a/vm/packer/scripts/vagrant.sh
+++ b/vm/packer/scripts/vagrant.sh
@@ -1,7 +1,8 @@
 #!/bin/bash
 
-# Create the user vagrant with password vagrant
-useradd vagrant
+# Create the user vagrant with password vagrant,
+# and avoid /bin/sh aka dash under Debian
+useradd vagrant -s /bin/bash
 echo 'vagrant'|passwd --stdin vagrant
 echo 'vagrant ALL=NOPASSWD:ALL' > /etc/sudoers.d/vagrant
 chmod 0440 /etc/sudoers.d/vagrant
diff --git a/vm/packer/scripts/virtualbox-centos.sh b/vm/packer/scripts/virtualbox-centos.sh
index 7a48858..11cc6ba 100644
--- a/vm/packer/scripts/virtualbox-centos.sh
+++ b/vm/packer/scripts/virtualbox-centos.sh
@@ -14,6 +14,13 @@ EOM
     # Build dependencies for VirtualBox guest additions
     yum -y install gcc make gcc-c++ kernel-devel-`uname -r` zlib-devel openssl-devel readline-devel sqlite-devel perl dkms nfs-utils
     
+    # Build work-around:
+    # http://wiki.centos.org/HowTos/Virtualization/VirtualBox/CentOSguest
+    # https://github.com/blalor/vm-image-configs/blob/master/scripts/virtualbox.sh
+    for i in /usr/src/kernels/* ; do
+	ln -s /usr/include/drm/drm{,_sarea,_mode,_fourcc}.h $i/include/drm/
+    done
+
     mount -o loop VBoxGuestAdditions_$VBOX_VERSION.iso /mnt
     sh /mnt/VBoxLinuxAdditions.run
     umount /mnt
@@ -21,6 +28,7 @@ EOM
     
     # TODO: FIXME: this leads to yum trying to remove 'yum' through a chain of dependencies
     #yum -y erase   gcc make gcc-c++ kernel-devel-`uname -r` zlib-devel readline-devel sqlite-devel perl dkms nfs-utils
+    yum -y erase  kernel-devel-`uname -r`
     rm -rf /etc/yum.repos.d/epel.repo
     rm -rf VBoxGuestAdditions_*.iso
 fi
diff --git a/vm/packer/scripts/virtualbox-debian.sh b/vm/packer/scripts/virtualbox-debian.sh
index 254404c..0f528a8 100755
--- a/vm/packer/scripts/virtualbox-debian.sh
+++ b/vm/packer/scripts/virtualbox-debian.sh
@@ -1,4 +1,10 @@
 if test -f .vbox_version ; then
   # Use version from Debian
   apt-get -y install --no-install-recommends linux-headers-amd64 virtualbox-guest-dkms
+
+  # Cleanup Virtualbox
+  #apt-get -y --force-yes remove linux-headers-$(uname -r) build-essential
+  #VBOX_VERSION=$(cat .vbox_version)
+  #VBOX_ISO=VBoxGuestAdditions_$VBOX_VERSION.iso
+  #rm $VBOX_ISO
 fi
diff --git a/vm/scripts/build.sh b/vm/scripts/build.sh
index c4b5a7e..63d4dc3 100755
--- a/vm/scripts/build.sh
+++ b/vm/scripts/build.sh
@@ -3,6 +3,7 @@
 # Authors :
 #  Roland Mas
 #  Olivier BERGER <olivier.berger at it-sudparis.eu>
+#  Sylvain Beucler
 
 # This script will build the Debian packages to be tested
 
@@ -17,19 +18,19 @@
 
 # Build dependencies
 aptitude -y install mini-dinstall dput devscripts equivs
-mk-build-deps -i /root/fusionforge/src/debian/control -t 'apt-get -y' -r
+mk-build-deps -i /usr/src/fusionforge/src/debian/control -t 'apt-get -y' -r
 
 
 # Populate the repo
-rm -rf /root/debian-repository
-mkdir -p /root/debian-repository
+rm -rf /usr/src/debian-repository
+mkdir -p /usr/src/debian-repository
 
 if [ ! -f /root/.mini-dinstall.conf ]; then
     cat >/root/.mini-dinstall.conf <<EOF
 
 [DEFAULT]
 
-archivedir = /root/debian-repository
+archivedir = /usr/src/debian-repository
 archive_style = flat
 
 architectures = all, i386, source
@@ -49,7 +50,7 @@ if [ ! -f /root/.dput.cf ]; then
 
 [local]
 fqdn = localhost
-incoming = /root/debian-repository/mini-dinstall/incoming 
+incoming = /usr/src/debian-repository/mini-dinstall/incoming 
 method = local
 run_dinstall = 0
 allow_unsigned_uploads = yes
@@ -68,7 +69,7 @@ fi
 
 mini-dinstall -b
 
-cd /root/fusionforge/src
+cd /usr/src/fusionforge/src
 f=$(mktemp)
 cp debian/changelog $f
 
diff --git a/vm/scripts/install.sh b/vm/scripts/install.sh
index 4dc8394..1a6c7dd 100755
--- a/vm/scripts/install.sh
+++ b/vm/scripts/install.sh
@@ -4,6 +4,7 @@
 # Authors :
 #  Roland Mas
 #  Olivier BERGER <olivier.berger at it-sudparis.eu>
+#  Sylvain Beucler
 
 # This script will install the Debian packages to be tested which have been build inside the VM
 
@@ -14,7 +15,7 @@
 grep -q debian-repository /etc/apt/sources.list
 if [ $? -ne 0 ]; then
     echo "You probably need to add the following in /etc/apt/sources.list :"
-    echo "echo 'deb file:///root/debian-repository local/' >> /etc/apt/sources.list"
+    echo "echo 'deb file:///usr/src/debian-repository local/' >> /etc/apt/sources.list"
     exit 1
 fi
 
@@ -28,7 +29,7 @@ gdebi --non-interactive loggerhead_1.19~bzr479-3_all.deb
 aptitude update
 if dpkg -l fusionforge-full | grep -q ^ii ; then
     # Already installed, upgrading
-    /root/fusionforge/tests/func/db_reload.sh
+    /usr/src/fusionforge/tests/func/db_reload.sh
     UCF_FORCE_CONFFNEW=yes LANG=C DEBIAN_FRONTEND=noninteractive aptitude -y dist-upgrade
 else
     # Initial installation
diff --git a/vm/scripts/run-testsuite.sh b/vm/scripts/run-testsuite.sh
index 567a602..dcf5466 100755
--- a/vm/scripts/run-testsuite.sh
+++ b/vm/scripts/run-testsuite.sh
@@ -6,12 +6,12 @@ aptitude -y install default-jre iceweasel
 # Build selenium
 aptitude -y install cowbuilder
 mkdir -p ~/builder/cow/
-DISTROLIST=wheezy /root/fusionforge/tests/scripts/manage-cowbuilder.sh
+DISTROLIST=wheezy /usr/src/fusionforge/tests/scripts/manage-cowbuilder.sh
 
 mkdir -p ~/build/
 aptitude -y install reprepro
 echo -e "Codename: wheezy\nArchitectures: amd64 source\nComponents: main" > ~/build/debian/conf/distributions
-cd /root/fusionforge/3rd-party/selenium
+cd /usr/src/fusionforge/3rd-party/selenium
 make
 
 
@@ -20,8 +20,8 @@ aptitude -y install php5-cli phpunit phpunit-selenium
 
 ## If available, install the JUnit OSLC provider test suite
 #if [ -d src/plugins/oslc/tests ]; then
-#    cd /root/fusionforge/src/plugins/oslc/tests
+#    cd /usr/src/fusionforge/src/plugins/oslc/tests
 #    ./setup-provider-test.sh
 #fi
 
-/root/fusionforge/tests/scripts/phpunit.sh DEBDebian70Tests.php
+/usr/src/fusionforge/tests/scripts/phpunit.sh DEBDebian70Tests.php

-----------------------------------------------------------------------

Summary of changes:
 vm/{Vagrantfile => Vagrantfile-sample}           |    5 +++--
 vm/packer/file/Desktop/build-and-install.desktop |    2 +-
 vm/packer/file/Desktop/run-testsuite.desktop     |    2 +-
 vm/packer/fusionforge-dev-centos.json            |    5 +++++
 vm/packer/scripts/cleanup-debian.sh              |    6 ------
 vm/packer/scripts/vagrant.sh                     |    5 +++--
 vm/packer/scripts/virtualbox-centos.sh           |    8 ++++++++
 vm/packer/scripts/virtualbox-debian.sh           |    6 ++++++
 vm/scripts/build.sh                              |   13 +++++++------
 vm/scripts/install.sh                            |    5 +++--
 vm/scripts/run-testsuite.sh                      |    8 ++++----
 11 files changed, 41 insertions(+), 24 deletions(-)
 rename vm/{Vagrantfile => Vagrantfile-sample} (97%)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list