summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHerman van Rink2019-02-25 14:05:54 (GMT)
committerHerman van Rink2019-02-25 14:05:54 (GMT)
commit41e83683f0308685cd1bc40ee4b5ec339b58b963 (patch)
tree2b8ad0c577574c5b268238a220e8af94c599f21f
parent2283ae602ffc20def01a945318ff22fde439f92a (diff)
parent3c40bec980eb01c131299beeb76bb840a716546b (diff)
Merge branch 'dev-ci-test-upgrade-runalltests' into 7.x-3.x
-rw-r--r--.gitlab-ci.yml8
-rw-r--r--debian/aegir3-cluster-slave.examples1
-rw-r--r--debian/control2
-rw-r--r--scripts/ci-aegir-stable-install-apt-debian10.sh3
-rwxr-xr-xscripts/ci-aegir-stable-install-apt-debian9.sh8
5 files changed, 9 insertions, 13 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a5eccfe..678eb4f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -252,9 +252,9 @@ publish:unstable-repo:
#
# Upgrade the latest stable Aegir to our unstable repo.
-upgradetest:debian-jessie-aegir3-apt-upgrade:
+upgradetest:debian-stretch-aegir3-apt-upgrade:
stage: upgradetest
- image: debian:jessie
+ image: debian:stretch
dependencies:
- publish:unstable-repo
@@ -271,7 +271,7 @@ upgradetest:debian-jessie-aegir3-apt-upgrade:
- apt-get install --yes sudo curl cron
script:
- - "scripts/ci-aegir-stable-install-apt-debian8.sh"
+ - "scripts/ci-aegir-stable-install-apt-debian9.sh"
# extra step to run the task queue.
- sudo su aegir --login --command 'drush @hostmaster php-eval "echo hosting_task_count();"'
- sudo su aegir --login --command 'drush @hostmaster hosting-tasks --force'
@@ -283,6 +283,6 @@ upgradetest:debian-jessie-aegir3-apt-upgrade:
- sudo su aegir --login --command 'drush @hostmaster php-eval "echo hosting_task_count_running();"'
# upgrade to the latest version from the unstable repo.
- rm -v /etc/apt/sources.list.d/aegir-stable.list
- - echo "deb http://debian.aegirproject.org unstable main" | sudo tee -a /etc/apt/sources.list.d/aegir-unstable.list
+ - echo "deb [signed-by=/usr/share/keyrings/aegir-archive-keyring.gpg] http://debian.aegirproject.org unstable main" | sudo tee -a /etc/apt/sources.list.d/aegir-unstable.list
- sudo apt-get update
- sudo apt-get --yes dist-upgrade
diff --git a/debian/aegir3-cluster-slave.examples b/debian/aegir3-cluster-slave.examples
deleted file mode 100644
index 4ce4ab0..0000000
--- a/debian/aegir3-cluster-slave.examples
+++ /dev/null
@@ -1 +0,0 @@
-example.sudoers
diff --git a/debian/control b/debian/control
index e825434..3dd4ca0 100644
--- a/debian/control
+++ b/debian/control
@@ -69,7 +69,7 @@ Description: mass Drupal hosting system
Package: aegir3-cluster-slave
Architecture: all
-Depends: ${misc:Depends}, php5-mysql | php7.0-mysql | php7.1-mysql | php7.2-mysql | php-mysql, sudo, apache2, adduser, ucf, libapache2-mod-php5 | libapache2-mod-php7.0 | libapache2-mod-php7.1 | libapache2-mod-php7.2 | libapache2-mod-php, rsync, nfs-client, mysql-client
+Depends: ${misc:Depends}, php5-mysql | php7.0-mysql | php7.1-mysql | php7.2-mysql | php-mysql, sudo, apache2, adduser, ucf, libapache2-mod-php5 | libapache2-mod-php7.0 | libapache2-mod-php7.1 | libapache2-mod-php7.2 | libapache2-mod-php, rsync, nfs-client, mysql-client, aegir3-provision
Recommends: php5-gd | php7.0-gd | php7.1-gd | php7.2-gd, php5 | php7.0 | php7.1 | php7.2 | php
Conflicts: aegir-cluster-slave, aegir-cluster-slave2, aegir2-cluster-slave, aegir3
Replaces: aegir-cluster-slave, aegir-cluster-slave2, aegir2-cluster-slave
diff --git a/scripts/ci-aegir-stable-install-apt-debian10.sh b/scripts/ci-aegir-stable-install-apt-debian10.sh
index 3fc790c..280b209 100644
--- a/scripts/ci-aegir-stable-install-apt-debian10.sh
+++ b/scripts/ci-aegir-stable-install-apt-debian10.sh
@@ -17,12 +17,11 @@ sudo apt-get install --yes mariadb-server
sudo /usr/bin/mysql -e "GRANT ALL ON *.* TO 'aegir_root'@'localhost' IDENTIFIED BY 'PASSWORD' WITH GRANT OPTION"
-debconf-set-selections <<EOF
+sudo debconf-set-selections <<EOF
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
-
sudo DPKG_DEBUG=developer apt-get install --yes aegir3
diff --git a/scripts/ci-aegir-stable-install-apt-debian9.sh b/scripts/ci-aegir-stable-install-apt-debian9.sh
index f5b6ee4..b56db0b 100755
--- a/scripts/ci-aegir-stable-install-apt-debian9.sh
+++ b/scripts/ci-aegir-stable-install-apt-debian9.sh
@@ -5,10 +5,10 @@
#
-sudo apt-get install --yes curl
+sudo apt-get install --yes wget apt-transport-https
-echo "deb http://debian.aegirproject.org stable main" | sudo tee -a /etc/apt/sources.list.d/aegir-stable.list
-curl https://debian.aegirproject.org/key.asc | sudo apt-key add -
+sudo wget -O /usr/share/keyrings/aegir-archive-keyring.gpg https://debian.aegirproject.org/aegir-archive-keyring.gpg
+echo "deb [signed-by=/usr/share/keyrings/aegir-archive-keyring.gpg] https://debian.aegirproject.org stable main" | sudo tee -a /etc/apt/sources.list.d/aegir-stable.list
sudo apt-get update
echo "debconf debconf/frontend select Noninteractive" | sudo debconf-set-selections
@@ -29,5 +29,3 @@ postfix postfix/main_mailer_type select Local only
EOF
sudo DPKG_DEBUG=developer apt-get install --yes aegir3
-
-