change travis behavior: build and install packages

Signed-off-by: Marco van Wieringen <marco.van.wieringen@bareos.com>
bareos · Feb 17, 2015 · a94e87b · a94e87b
1 parent 2c32032
commit a94e87b
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 35 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -29,37 +29,47 @@ env:
         # -- END Coverity Scan ENV
 
     matrix:
-        - DB=postgresql CONFIGURE_DB="--with-postgresql"
-        - DB=mysql      CONFIGURE_DB="--with-mysql"
-        - DB=sqlite     CONFIGURE_DB="--with-sqlite3"
-        - DB=postgresql CONFIGURE_DB="--with-postgresql" COVERITY_SCAN=1
+        - DB=postgresql
+        - DB=mysql
+        - DB=sqlite3
+        - DB=postgresql COVERITY_SCAN=1
 
 matrix:
     # covertiy scan should only run once and it might fail,
     # because the number of times its runs is limited per week.
     # We only check when compiled with gcc.
     exclude:
         - compiler: clang
-          env: DB=postgresql CONFIGURE_DB="--with-postgresql" COVERITY_SCAN=1
+          env: DB=postgresql COVERITY_SCAN=1
     allow_failures:
-        - env: DB=postgresql CONFIGURE_DB="--with-postgresql" COVERITY_SCAN=1 
+        - env: DB=postgresql COVERITY_SCAN=1
 
 before_install:
+    # install build dependencies
+    #   use files instead of shell variables, because travis has some problems supporting variables
     - sudo apt-get -qq update
-    - yes "" | sudo apt-get -q --assume-no install acl-dev autotools-dev bc debhelper dpkg-dev hostname libacl1-dev libcap-dev liblzo2-dev libqt4-dev libreadline-dev libssl-dev libwrap0-dev libx11-dev libsqlite3-dev libmysqlclient-dev libpq-dev lsb-release mtx ncurses-dev pkg-config po-debconf python-dev zlib1g-dev
+    - dpkg-checkbuilddeps 2> /tmp/dpkg-builddeps || true
+    - sed "s/.*:.*:\s//" /tmp/dpkg-builddeps > /tmp/build_depends
+    - yes "" | sudo xargs --arg-file /tmp/build_depends apt-get -q --assume-no install
 
 before_script:
-    - ./configure --prefix=/usr --with-sbin-perm=755 --sysconfdir=/etc/bareos --docdir=/usr/share/doc/bareos --htmldir=/usr/share/doc/bareos/html --with-archivedir=/var/lib/bareos/storage --with-scriptdir=/usr/lib/bareos/scripts --with-plugindir=/usr/lib/bareos/plugins --with-working-dir=/var/lib/bareos --with-pid-dir=/var/lib/bareos   --with-bsrdir=/var/lib/bareos --with-logdir=/var/log/bareos --with-subsys-dir=/var/lock --enable-smartalloc --disable-conio --enable-readline --enable-batch-insert --enable-dynamic-cats-backends --enable-acl --enable-bat --enable-traymonitor --enable-xattr --enable-scsi-crypto --enable-ipv6 --with-tcp-wrappers --with-openssl --with-dir-user=bareos  --with-dir-group=bareos --with-sd-user=bareos --with-sd-group=bareos --with-fd-user=root --with-fd-group=bareos --with-dir-password="XXX_REPLACE_WITH_DIRECTOR_PASSWORD_XXX" --with-fd-password="XXX_REPLACE_WITH_CLIENT_PASSWORD_XXX" --with-sd-password="XXX_REPLACE_WITH_STORAGE_PASSWORD_XXX" --with-mon-dir-password="XXX_REPLACE_WITH_DIRECTOR_MONITOR_PASSWORD_XXX" --with-mon-fd-password="XXX_REPLACE_WITH_CLIENT_MONITOR_PASSWORD_XXX" --with-mon-sd-password="XXX_REPLACE_WITH_STORAGE_MONITOR_PASSWORD_XXX" --with-basename="XXX_REPLACE_WITH_LOCAL_HOSTNAME_XXX" --with-hostname="XXX_REPLACE_WITH_LOCAL_HOSTNAME_XXX" ${CONFIGURE_DB}
-    # --enable-ndmp
-    - if [ "${COVERITY_SCAN}" = '1' ]; then eval "$COVERITY_SCAN_BUILD"; else make; fi
-    - for script in $PWD/debian/bareos*.preinst; do echo "$script"; sudo /bin/sh $script install; done
-    - sudo make install
-    - sudo make install-autostart
-    - for script in $PWD/debian/bareos*.postinst; do echo "$script"; sudo /bin/sh $script configure; done
+    # changelog file is required (and normally generated by OBS)
+    - cp -a platforms/packaging/bareos.changes debian/changelog
+    # build Debian packages
+    - if [ -z "${COVERITY_SCAN}" ]; then fakeroot debian/rules binary; else debian/rules override_dh_auto_configure; eval "$COVERITY_SCAN_BUILD"; fi
+    # create Debian package repository
+    - cd ..
+    - if [ -z "${COVERITY_SCAN}" ]; then dpkg-scanpackages . /dev/null | gzip > Packages.gz; fi
+    - if [ -z "${COVERITY_SCAN}" ]; then printf 'deb file:%s /\n' $PWD > /tmp/bareos.list; fi
+    - if [ -z "${COVERITY_SCAN}" ]; then sudo cp /tmp/bareos.list /etc/apt/sources.list.d/bareos.list; fi
+    - cd -
+    # install Bareos packages
+    - if [ -z "${COVERITY_SCAN}" ]; then sudo apt-get -qq update; fi
+    - if [ -z "${COVERITY_SCAN}" ]; then sudo apt-get install -y --force-yes bareos bareos-database-$DB; fi
 
-# test script
 script:
-    - if [ "${COVERITY_SCAN}" != '1' ]; then sudo -E $PWD/test/all; fi
+    # run test script
+    - if [ -z "${COVERITY_SCAN}" ]; then sudo -E $PWD/test/all; fi
 
 addons:
     hosts:

diff --git a/test/all b/test/all
@@ -8,25 +8,6 @@ echo "TRAVIS_BRANCH: $TRAVIS_BRANCH"
 echo "USER: $USER"
 echo "DB: $DB"
 
-chown ${daemon_user}:${daemon_group} /etc/bareos/*.conf
-chmod ug=rw,o+r /etc/bareos/*.conf
-chmod a+rx /etc/bareos/
-
-ls -la /etc/bareos/
-
-case "$DB" in
-    postgres*)
-        su postgres -c /usr/lib/bareos/scripts/create_bareos_database
-        su postgres -c /usr/lib/bareos/scripts/make_bareos_tables
-        su postgres -c /usr/lib/bareos/scripts/grant_bareos_privileges
-        ;;
-    *)
-        /usr/lib/bareos/scripts/create_bareos_database
-        /usr/lib/bareos/scripts/make_bareos_tables
-        /usr/lib/bareos/scripts/grant_bareos_privileges
-        ;;
-esac
-
 echo "--------- starting services ----------- "
 service bareos-dir start
 service bareos-sd start