summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHerman van Rink2017-09-17 20:12:27 (GMT)
committerHerman van Rink2017-09-17 20:12:27 (GMT)
commit6098ed53ff991f94dd42e65f24b8ad54150a0db5 (patch)
tree30d088f9a0b712217fff471a169034d9affed929
parent7b84b9fffd3baa5eaf498baedc02143d82d5a536 (diff)
parent8cba6d0db13f5603de4f1cdf79294f2097b288a3 (diff)
Issue 2909460 by helmo: Add support for PHP 7.1 pa ckages in Ubuntu Artful
-rw-r--r--.gitlab-ci.yml18
-rw-r--r--debian/control10
-rwxr-xr-xscripts/ci-aegir-dev-install-apt-ubuntu-artful.sh37
-rwxr-xr-xscripts/ci-aegir-dev-install-apt-ubuntu-xenial.sh (renamed from scripts/ci-aegir-dev-install-apt-ubuntu.sh)0
4 files changed, 59 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3c7653b..c6ebe54 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 1855082..af4f11d 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 0000000..726c2c7
--- /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 <<EOF
+aegir3-hostmaster aegir/db_password string PASSWORD
+aegir3-hostmaster aegir/db_password seen true
+aegir3-hostmaster aegir/db_user string root
+aegir3-hostmaster aegir/db_host string localhost
+aegir3-hostmaster aegir/email string aegir@example.com
+aegir3-hostmaster aegir/site string aegir.example.com
+postfix postfix/main_mailer_type select Local only
+
+EOF
+
+echo "[CI] Pre-installing dependencies"
+sudo apt-get install --yes mariadb-server mariadb-client php7.1-mysql php7.1-cli php7.1-gd php7.1 postfix
+
+echo "[CI] Installing .deb files .. will fail on missing packages"
+sudo DPKG_DEBUG=developer dpkg --install build/aegir3_*.deb build/aegir3-provision*.deb build/aegir3-hostmaster*.deb
+
+echo "[CI] Installing remaining packages and configuring our debs"
+sudo apt-get install --fix-broken --yes
+
diff --git a/scripts/ci-aegir-dev-install-apt-ubuntu.sh b/scripts/ci-aegir-dev-install-apt-ubuntu-xenial.sh
index a09543b..a09543b 100755
--- a/scripts/ci-aegir-dev-install-apt-ubuntu.sh
+++ b/scripts/ci-aegir-dev-install-apt-ubuntu-xenial.sh