From a096fabb68b6a18d43499733334d02225518bc83 Mon Sep 17 00:00:00 2001 From: Jon Pugh Date: Thu, 28 Jul 2016 08:30:28 -0400 Subject: [PATCH 01/12] first stab at travis.yml --- .travis.yml | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..7e3b94b --- /dev/null +++ b/.travis.yml @@ -0,0 +1,73 @@ +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: + + # Get test scripts + - git clone git@github.com:aegir-project/tests.git + - cd tests + + # Build a makefile for this hostmaster clone. + - echo projects[hostmaster][download][type] = "copy" >> build-hostmaster.make + - echo projects[hostmaster][download][url] = "$TRAVIS_BUILD_DIR" >> build-hostmaster.make + - cat build-hostmaster.make + - cd .. + + # 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 image. + - sudo docker pull aegir/hostmaster + + +script: +# - 'sudo docker run --detach --name aegir_hostmaster -h aegir.travis --add-host "sitetest.aegir.travis":127.0.0.1 ${distribution}-${version}:ansible "${init}"' + - 'git clone git@github.com:aegir-project/tests.git' + - 'cd tests' + + # The test run is included in the docker-entrypoint-tests.sh file. + - 'sudo docker-compose up --abort-on-container-exit' + + # Turn off hosting queued, and the hosting task queue. +# - 'sudo docker exec aegir_hostmaster env sudo su - aegir -c "drush @hostmaster dis hosting_queued -y -v"' +# - 'sudo docker exec aegir_hostmaster env sudo su - aegir -c "drush @hostmaster vset hosting_queue_tasks_enabled 0 -y"' + + # Build and Run Tests +# - 'sudo docker exec aegir_hostmaster env TERM=xterm sudo su - -c "cd /usr/share/devshop/tests && composer update"' +# - 'sudo docker exec devshop_container env TERM=xterm sudo su - aegir -c "devshop devmaster:test"' + + # Stop container. + - 'sudo docker-compose stop' \ No newline at end of file From b6ae6e5897a88fafd5ecea5764180f4fd92af781 Mon Sep 17 00:00:00 2001 From: Jon Pugh Date: Thu, 28 Jul 2016 08:47:11 -0400 Subject: [PATCH 02/12] Fixing up script section of travis file to use the new recommended method. --- .travis.yml | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7e3b94b..82eee38 100644 --- a/.travis.yml +++ b/.travis.yml @@ -54,20 +54,7 @@ before_install: script: -# - 'sudo docker run --detach --name aegir_hostmaster -h aegir.travis --add-host "sitetest.aegir.travis":127.0.0.1 ${distribution}-${version}:ansible "${init}"' - - 'git clone git@github.com:aegir-project/tests.git' - - 'cd tests' - # The test run is included in the docker-entrypoint-tests.sh file. - - 'sudo docker-compose up --abort-on-container-exit' - - # Turn off hosting queued, and the hosting task queue. -# - 'sudo docker exec aegir_hostmaster env sudo su - aegir -c "drush @hostmaster dis hosting_queued -y -v"' -# - 'sudo docker exec aegir_hostmaster env sudo su - aegir -c "drush @hostmaster vset hosting_queue_tasks_enabled 0 -y"' - - # Build and Run Tests -# - 'sudo docker exec aegir_hostmaster env TERM=xterm sudo su - -c "cd /usr/share/devshop/tests && composer update"' -# - 'sudo docker exec devshop_container env TERM=xterm sudo su - aegir -c "devshop devmaster:test"' - - # Stop container. - - 'sudo docker-compose stop' \ No newline at end of file + # Tests are included in the docker-compose.yml file in the tests repo. + - cd tests + - sudo docker-compose run hostmaster --rm From 4dea68bb872f4dc0961e49c7ba0158663f42fc85 Mon Sep 17 00:00:00 2001 From: Jon Pugh Date: Thu, 28 Jul 2016 08:52:56 -0400 Subject: [PATCH 03/12] Fixing git url --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 82eee38..a99d6ac 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,7 +26,7 @@ services: before_install: # Get test scripts - - git clone git@github.com:aegir-project/tests.git + - git clone http://github.com/aegir-project/tests.git - cd tests # Build a makefile for this hostmaster clone. From cb2c764745fe00c8b0e18a862844f73481c1c353 Mon Sep 17 00:00:00 2001 From: Jon Pugh Date: Thu, 28 Jul 2016 09:09:16 -0400 Subject: [PATCH 04/12] Removing makefile generation from travis yml. --- .travis.yml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index a99d6ac..3e85766 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,13 +27,7 @@ before_install: # Get test scripts - git clone http://github.com/aegir-project/tests.git - - cd tests - - # Build a makefile for this hostmaster clone. - - echo projects[hostmaster][download][type] = "copy" >> build-hostmaster.make - - echo projects[hostmaster][download][url] = "$TRAVIS_BUILD_DIR" >> build-hostmaster.make - - cat build-hostmaster.make - - cd .. + - cd tests/travis # list docker-engine versions - apt-cache madison docker-engine @@ -56,5 +50,4 @@ before_install: script: # Tests are included in the docker-compose.yml file in the tests repo. - - cd tests - sudo docker-compose run hostmaster --rm From faa97c06a34d44ba24f25842adac33edcb51d3b8 Mon Sep 17 00:00:00 2001 From: Jon Pugh Date: Thu, 28 Jul 2016 09:23:29 -0400 Subject: [PATCH 05/12] Whitespace. --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3e85766..297b3d3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,7 +46,6 @@ before_install: # Get aegir/hostmaster image. - sudo docker pull aegir/hostmaster - script: # Tests are included in the docker-compose.yml file in the tests repo. From 3bbb9eb346a0ee54a77ae1a28bfb21383eca8f23 Mon Sep 17 00:00:00 2001 From: Jon Pugh Date: Thu, 28 Jul 2016 09:27:42 -0400 Subject: [PATCH 06/12] Echoing TRAVIS_BUILD_DIR. --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 297b3d3..62f6302 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,6 +46,8 @@ before_install: # Get aegir/hostmaster image. - sudo docker pull aegir/hostmaster + - echo $TRAVIS_BUILD_DIR + script: # Tests are included in the docker-compose.yml file in the tests repo. From 27d3bbde9604d9ee416d8c35b4c6347e555f1992 Mon Sep 17 00:00:00 2001 From: Jon Pugh Date: Thu, 28 Jul 2016 09:35:58 -0400 Subject: [PATCH 07/12] Whitespace. --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 62f6302..edf717a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -45,7 +45,6 @@ before_install: # Get aegir/hostmaster image. - sudo docker pull aegir/hostmaster - - echo $TRAVIS_BUILD_DIR script: From aad64ba9ee33c701a116eff8c3c5a9991ea41997 Mon Sep 17 00:00:00 2001 From: Jon Pugh Date: Thu, 28 Jul 2016 10:02:29 -0400 Subject: [PATCH 08/12] Pull mariadb in pre-install. --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index edf717a..803f215 100644 --- a/.travis.yml +++ b/.travis.yml @@ -45,6 +45,7 @@ before_install: # Get aegir/hostmaster image. - sudo docker pull aegir/hostmaster + - sudo docker pull mariadb - echo $TRAVIS_BUILD_DIR script: From 8c20357f23cd10ea6582c7801e07564ab28669dc Mon Sep 17 00:00:00 2001 From: Jon Pugh Date: Thu, 28 Jul 2016 10:16:54 -0400 Subject: [PATCH 09/12] Moving echo $TRAVIS_BUILD_DIR to top. --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 803f215..5d4c46e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,6 +24,8 @@ 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 @@ -43,10 +45,9 @@ before_install: - docker --version - docker-compose --version - # Get aegir/hostmaster image. + # Get aegir/hostmaster and database images. - sudo docker pull aegir/hostmaster - sudo docker pull mariadb - - echo $TRAVIS_BUILD_DIR script: From 967265f04ba86e8e74f5348a9cdf0cff107f6053 Mon Sep 17 00:00:00 2001 From: Jon Pugh Date: Wed, 3 Aug 2016 12:52:35 -0400 Subject: [PATCH 10/12] Committing bad code to test pull request testing. --- hostmaster.install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hostmaster.install b/hostmaster.install index 3926a52..c0f6fcc 100644 --- a/hostmaster.install +++ b/hostmaster.install @@ -1,5 +1,5 @@ Date: Wed, 3 Aug 2016 13:01:54 -0400 Subject: [PATCH 11/12] Adding bootstrap to aegir core themes... Intentionally misspelled to test a failing test. --- drupal-org.make | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drupal-org.make b/drupal-org.make index 29fbe71..5800283 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[bootstraps][type] = theme +projects[bootstraps][subdir] = aegir + projects[hosting][subdir] = aegir From fe59206fdaaf4da093dd3bdc76c7083a74563109 Mon Sep 17 00:00:00 2001 From: Jon Pugh Date: Wed, 3 Aug 2016 13:07:39 -0400 Subject: [PATCH 12/12] Fixing the name of the bootstrap theme. --- drupal-org.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drupal-org.make b/drupal-org.make index 5800283..d886f2c 100644 --- a/drupal-org.make +++ b/drupal-org.make @@ -14,8 +14,8 @@ defaults[projects][type] = "module" projects[eldir][type] = theme projects[eldir][subdir] = aegir -projects[bootstraps][type] = theme -projects[bootstraps][subdir] = aegir +projects[bootstrap][type] = theme +projects[bootstrap][subdir] = aegir projects[hosting][subdir] = aegir