diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3c7653b7e5957180464c01c850b18a5054536b67..c6ebe5485bc1a0c53bdaac15bf34bd725db4048f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -80,7 +80,23 @@ test:ubuntu-xenial-aegir3-apt: - echo "exit 0" >> /usr/sbin/policy-rc.d - apt-get install --yes sudo curl - script: "scripts/ci-aegir-dev-install-apt-ubuntu.sh" + script: "scripts/ci-aegir-dev-install-apt-ubuntu-xenial.sh" + +test:ubuntu-artful-aegir3-apt: + stage: test + image: ubuntu:artful + dependencies: + - build:deb + allow_failure: true + + before_script: + - apt-get update + # Avoid ERROR: invoke-rc.d: policy-rc.d denied execution of start. + - echo "#!/bin/sh" > /usr/sbin/policy-rc.d + - echo "exit 0" >> /usr/sbin/policy-rc.d + - apt-get install --yes sudo curl + + script: "scripts/ci-aegir-dev-install-apt-ubuntu-artful.sh" test:behat: stage: test diff --git a/debian/control b/debian/control index 1855082f096e353aeed6a9a79109dc3c1a80f024..af4f11d8238ca379715aa27c17899eaffe49a4c1 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,7 @@ Vcs-browser: http://drupalcode.org/project/provision.git Package: aegir3-provision Architecture: all -Depends: ${misc:Depends}, php5-cli (>= 5.3) | php7.0-cli, php5 | php7.0-xml, php5-mysql | php7.0-mysql, mysql-client | mariadb-client, sudo, postfix | mail-transport-agent, apache2 | nginx, adduser, ucf, curl +Depends: ${misc:Depends}, php5-cli (>= 5.3) | php7.0-cli | php7.1-cli, php5 | php7.0-xml | php7.1-xml, php5-mysql | php7.0-mysql | php7.1-mysql, mysql-client | mariadb-client, sudo, postfix | mail-transport-agent, apache2 | nginx, adduser, ucf, curl Recommends: mysql-server | mariadb-server, rsync Conflicts: aegir-provision, aegir-provision2, aegir2-provision Replaces: aegir-provision, aegir-provision2, aegir2-provision @@ -30,8 +30,8 @@ Description: mass Drupal hosting system - backend Package: aegir3-hostmaster Architecture: all -Depends: ${misc:Depends}, php5-mysql | php7.0-mysql, php5-gd | php7.0-gd, apache2 | nginx, libapache2-mod-php5 | libapache2-mod-php7.0 | php5-fpm | php7.0-fpm, aegir3-provision (>= ${source:Version}), git-core, unzip, lsb-base (>= 3.0-6) -Recommends: php5 | php7.0 +Depends: ${misc:Depends}, php5-mysql | php7.0-mysql | php7.1-mysql, php5-gd | php7.0-gd | php7.1-gd, apache2 | nginx, libapache2-mod-php5 | libapache2-mod-php7.0 | libapache2-mod-php7.1 | php5-fpm | php7.0-fpm | php7.1-fpm, aegir3-provision (>= ${source:Version}), git-core, unzip, lsb-base (>= 3.0-6) +Recommends: php5 | php7.0 | php7.1 Conflicts: aegir-hostmaster, aegir-hostmaster2, aegir2-hostmaster Replaces: aegir-hostmaster, aegir-hostmaster2, aegir2-hostmaster Description: mass Drupal hosting system - frontend @@ -69,8 +69,8 @@ Description: mass Drupal hosting system Package: aegir3-cluster-slave Architecture: all -Depends: ${misc:Depends}, php5-mysql | php7.0-mysql, sudo, apache2, adduser, ucf, libapache2-mod-php5 | libapache2-mod-php7.0, rsync, nfs-client, mysql-client -Recommends: php5-gd | php7.0-gd, php5 | php7.0 +Depends: ${misc:Depends}, php5-mysql | php7.0-mysql | php7.1-mysql, sudo, apache2, adduser, ucf, libapache2-mod-php5 | libapache2-mod-php7.0 | libapache2-mod-php7.1, rsync, nfs-client, mysql-client +Recommends: php5-gd | php7.0-gd | php7.1-gd, php5 | php7.0 | php7.1 Conflicts: aegir-cluster-slave, aegir-cluster-slave2, aegir2-cluster-slave, aegir3 Replaces: aegir-cluster-slave, aegir-cluster-slave2, aegir2-cluster-slave Description: web frontend for the Aegir hosting system diff --git a/scripts/ci-aegir-dev-install-apt-ubuntu-artful.sh b/scripts/ci-aegir-dev-install-apt-ubuntu-artful.sh new file mode 100755 index 0000000000000000000000000000000000000000..726c2c7f574d6c7f2345135927908ab694315217 --- /dev/null +++ b/scripts/ci-aegir-dev-install-apt-ubuntu-artful.sh @@ -0,0 +1,37 @@ +# +# Install Aegir debian packages located in the 'build/' directory. +# These are provided by the GitLab CI build stage. +# +# This script is tuned for Ubuntu 16.04. +# +echo "[CI] Updating APT" +sudo apt-get update + +echo "[CI] Setting debconf settings" +echo "debconf debconf/frontend select Noninteractive" | debconf-set-selections +#echo "debconf debconf/priority select critical" | debconf-set-selections + + +echo mysql-server-5.7 mysql-server/root_password password PASSWORD | debconf-set-selections +echo mysql-server-5.7 mysql-server/root_password_again password PASSWORD | debconf-set-selections + +debconf-set-selections <