Fix test build failures by switching from PHP 7.0 to 7.1.

geerlingguy · Oct 23, 2018 · cda1e7a · cda1e7a
1 parent 43b8df8
commit cda1e7a
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 63 deletions.
diff --git a/molecule/default/playbook-composer.yml b/molecule/default/playbook-composer.yml
@@ -12,14 +12,7 @@
     drush_composer_global_install: true
     drush_composer_update: true
 
-  handlers:
-    - name: update apt cache
-      apt: update_cache=true
-
   pre_tasks:
-    - name: Enable remi repo for PHP 7.0 (RedHat).
-      set_fact: php_enablerepo="remi,remi-php70"
-      when: ansible_os_family == 'RedHat'
 
     - name: Update apt cache.
       apt: update_cache=true cache_valid_time=600
@@ -28,32 +21,10 @@
     - name: Ensure unzip is installed.
       package: name=unzip state=present
 
-    # Debian-specific tasks.
-    - name: Add dependencies for PHP versions (Debian).
-      apt:
-        name:
-          - apt-transport-https
-          - ca-certificates
-      when: ansible_distribution == "Debian"
-
-    - name: Add Ondrej Sury's apt key (Debian).
-      apt_key:
-        url: https://packages.sury.org/php/apt.gpg
-        state: present
-      when: ansible_distribution == "Debian"
-
-    - name: Add Ondrej Sury's repo (Debian).
-      apt_repository:
-        repo: "deb https://packages.sury.org/php/ {{ ansible_distribution_release }} main"
-        state: present
-      when: ansible_distribution == "Debian"
-      notify: update apt cache
-
-    - meta: flush_handlers
-
   roles:
     - role: geerlingguy.repo-remi
       when: ansible_os_family == 'RedHat'
+    - role: geerlingguy.php-versions
     - role: geerlingguy.php
     - role: geerlingguy.composer
     - role: geerlingguy.drush
diff --git a/molecule/default/playbook-source.yml b/molecule/default/playbook-source.yml
@@ -11,17 +11,14 @@
     drush_install_from_source: true
 
   pre_tasks:
-    - name: Enable remi repo for PHP 7.0 (RedHat).
-      set_fact: php_enablerepo="remi,remi-php70"
-      when: ansible_os_family == 'RedHat'
-
     - name: Update apt cache.
       apt: update_cache=true cache_valid_time=600
       when: ansible_os_family == 'Debian'
 
   roles:
     - role: geerlingguy.repo-remi
       when: ansible_os_family == 'RedHat'
+    - role: geerlingguy.php-versions
     - role: geerlingguy.php
     - role: geerlingguy.composer
     - role: geerlingguy.git

diff --git a/molecule/default/playbook.yml b/molecule/default/playbook.yml
@@ -7,46 +7,18 @@
     php_enable_webserver: false
     php_opcache_enable: "0"
 
-  handlers:
-    - name: update apt cache
-      apt: update_cache=true
-
   pre_tasks:
-    - name: Enable remi repo for PHP 7.0 (RedHat).
-      set_fact: php_enablerepo="remi,remi-php70"
-      when: ansible_os_family == 'RedHat'
-
     - name: Update apt cache.
       apt: update_cache=true cache_valid_time=600
       when: ansible_os_family == 'Debian'
 
     - name: Ensure unzip is installed.
       package: name=unzip state=present
 
-    # Debian-specific tasks.
-    - name: Add dependencies for PHP versions (Debian).
-      apt:
-        name:
-          - apt-transport-https
-          - ca-certificates
-      when: ansible_distribution == "Debian"
-
-    - name: Add Ondrej Sury's apt key (Debian).
-      apt_key:
-        url: https://packages.sury.org/php/apt.gpg
-        state: present
-      when: ansible_distribution == "Debian"
-
-    - name: Add Ondrej Sury's repo (Debian).
-      apt_repository:
-        repo: "deb https://packages.sury.org/php/ {{ ansible_distribution_release }} main"
-        state: present
-      when: ansible_distribution == "Debian"
-      notify: update apt cache
-
   roles:
     - role: geerlingguy.repo-remi
       when: ansible_os_family == 'RedHat'
+    - role: geerlingguy.php-versions
     - role: geerlingguy.php
     - role: geerlingguy.composer
     - role: geerlingguy.drush
diff --git a/molecule/default/requirements.yml b/molecule/default/requirements.yml
@@ -1,5 +1,6 @@
 ---
 - src: geerlingguy.repo-remi
+- src: geerlingguy.php-versions
 - src: geerlingguy.php
 - src: geerlingguy.composer
 - src: geerlingguy.git