From ee328537abb890995f4d30e4215a6cadcef443aa Mon Sep 17 00:00:00 2001 From: root Date: Tue, 14 Apr 2015 20:55:19 +0200 Subject: [PATCH] trying to build travis env --- .travis.yml | 5 ++++- tests/cfg/deploy.sh | 11 ++++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 31d0b96..433c6c8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,10 +1,13 @@ +env: + - TRAVIS="yes" + before_install: - curl https://ftp-master.debian.org/keys/archive-key-7.0.asc | sudo apt-key add - - echo "deb http://http.debian.net/debian wheezy-backports main" | sudo tee -a /etc/apt/sources.list - echo "deb http://http.debian.net/debian wheezy main" | sudo tee -a /etc/apt/sources.list - sudo /sbin/ifconfig - sudo apt-get update -qq - - sudo DEBIAN_FRONTEND=noninteractive apt-get upgrade -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" -f -q -y ; true + - sudo rm /etc/dpkg/dpkg.cfg.d/multiarch - sudo ./tests/cfg/deploy.sh language: python diff --git a/tests/cfg/deploy.sh b/tests/cfg/deploy.sh index bfee66c..ab1890a 100755 --- a/tests/cfg/deploy.sh +++ b/tests/cfg/deploy.sh @@ -1,8 +1,13 @@ #!/bin/sh -DEBIAN_FRONTEND=noninteractive apt-get install ldap-utils slapd -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" -f -q -y -DEBIAN_FRONTEND=noninteractive apt-get install lsb-base libattr1 -t wheezy -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" -f -q -y -DEBIAN_FRONTEND=noninteractive apt-get install samba python-samba samba-vfs-modules -t wheezy-backports -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" -f -q -y +if ! [ -z "$TRAVIS" ] +then + DEBIAN_FRONTEND=noninteractive apt-get install ldap-utils slapd -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" -f -q -y + DEBIAN_FRONTEND=noninteractive apt-get install lsb-base libattr1 -t wheezy -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" -f -q -y + DEBIAN_FRONTEND=noninteractive apt-get install samba python-samba samba-vfs-modules -t wheezy-backports -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" -f -q -y +else + DEBIAN_FRONTEND=noninteractive apt-get install ldap-utils slapd samba python-samba samba-vfs-modules -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" -f -q -y +fi rsync -a `dirname $0`/ / cd `dirname $0`/../../