diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..5d4c46e --- /dev/null +++ b/.travis.yml @@ -0,0 +1,55 @@ +language: generic + +sudo: required + +env: + globaL: + - DOCKER_VERSION=1.11.2-0~trusty + - DOCKER_COMPOSE_VERSION=1.7.1 + - AEGIR_TESTS_VERSION + +#env: +# - test: Ubuntu 14.04 Apache +# distribution: ubuntu +# version: 14.04 +# init: /sbin/init +# run_opts: "" + +addons: + hosts: + - aegir.travis + - sitetest.aegir.travis + +services: + - docker + +before_install: + # Show travis build dir variable. + - echo $TRAVIS_BUILD_DIR + + # Get test scripts + - git clone http://github.com/aegir-project/tests.git + - cd tests/travis + + # list docker-engine versions + - apt-cache madison docker-engine + + # upgrade docker-engine to specific version + - sudo apt-get -o Dpkg::Options::="--force-confnew" install -y docker-engine=${DOCKER_VERSION} + + # reinstall docker-compose at specific version + - sudo rm /usr/local/bin/docker-compose + - curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose + - chmod +x docker-compose + - sudo mv docker-compose /usr/local/bin + - docker --version + - docker-compose --version + + # Get aegir/hostmaster and database images. + - sudo docker pull aegir/hostmaster + - sudo docker pull mariadb + +script: + + # Tests are included in the docker-compose.yml file in the tests repo. + - sudo docker-compose run hostmaster --rm diff --git a/drupal-org.make b/drupal-org.make index 29fbe71..d886f2c 100644 --- a/drupal-org.make +++ b/drupal-org.make @@ -14,6 +14,9 @@ defaults[projects][type] = "module" projects[eldir][type] = theme projects[eldir][subdir] = aegir +projects[bootstrap][type] = theme +projects[bootstrap][subdir] = aegir + projects[hosting][subdir] = aegir diff --git a/hostmaster.install b/hostmaster.install index 3926a52..c0f6fcc 100644 --- a/hostmaster.install +++ b/hostmaster.install @@ -1,5 +1,5 @@