Bug fixes 2.x pr 2.x

.github/workflows/ce-provision-test-web.yml

@@ -10,7 +10,7 @@ jobs:
     # Name the Job
     name: Run tests against Ansible code base
     # Set the type of machine to run on
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
 
     steps:
       # Checks out a copy of your repository on the ubuntu-latest machine
@@ -31,12 +31,12 @@ jobs:
           sudo mv ./mkcert /usr/local/bin && cd ../
           sudo chmod +x /usr/local/bin/mkcert
           rm -Rf mkcert
-          curl -sL https://raw.githubusercontent.com/codeenigma/ce-dev/1.x/install.sh | /bin/sh -s -- linux
+          curl -sL https://raw.githubusercontent.com/codeenigma/ce-dev/${{ github.event.pull_request.base.ref }}/install.sh | /bin/sh -s -- --platform linux
 
       # Uses the ce-dev stack to run a test provision
       - name: Run a test provision
         if: ${{ github.event.pull_request.head.ref != 'documentation' }}
         run: |
-          git clone --branch 1.x https://github.com/codeenigma/ce-dev-ce-provision-config.git config
-          /bin/bash ce-dev/ansible/test.sh --examples web --own-branch ${{ github.event.pull_request.base.ref }} --config-branch ${{ github.event.pull_request.base.ref }}
+          git clone --branch ${{ github.event.pull_request.base.ref }} https://github.com/codeenigma/ce-dev-ce-provision-config.git config
+          /bin/bash ce-dev/ansible/test.sh --examples web --own-branch ${{ github.event.pull_request.head.ref }} --config-branch ${{ github.event.pull_request.base.ref }}
         shell: bash

ce-dev/ansible/plays/_common/setup.yml

@@ -0,0 +1,20 @@
+---
+# Run the _init role to correctly install Ansible first.
+- hosts: provision-target
+  become: true
+
+  vars:
+    project_name: blank
+    is_local: true
+    _ce_provision_base_dir: /home/ce-dev/ce-provision
+    _init:
+      force_play: true
+      vars_dirs:
+        - "{{ _ce_provision_base_dir }}/ce-dev/ansible/vars/_common"
+        - "{{ _ce_provision_base_dir }}/ce-dev/ansible/vars/{{ project_name }}"
+
+  tasks:
+    - ansible.builtin.import_role:
+        name: _init
+    - ansible.builtin.import_role:
+        name: _exit

ce-dev/ansible/test.sh

@@ -94,15 +94,19 @@ provision-target
 provision-privileged
 EOT
   PROVISION_CMD="/bin/sh /home/ce-dev/ce-provision/scripts/provision.sh"
-  echo "# Executing $1 project"
-  PROVISION_CMD="$PROVISION_CMD --repo dummy --branch dummy --workspace /home/ce-dev/ce-provision/ce-dev/ansible --playbook plays/$1/$1.yml --own-branch $2 --config-branch $3 --force"
   if [ $VERBOSE = true ]; then
     echo "# In verbose mode"
     PROVISION_CMD="$PROVISION_CMD --verbose"
   fi
-  echo "# Running command: $PROVISION_CMD"
+  echo "# Executing $1 project"
+  PROVISION_EXEC="$PROVISION_CMD --repo dummy --branch dummy --workspace /home/ce-dev/ce-provision/ce-dev/ansible --playbook plays/_common/setup.yml --own-branch $2 --config-branch $3 --force"
+  echo "# Installing Ansible in a venv: $PROVISION_EXEC"
+  # shellcheck disable=SC2086
+  sudo docker exec -t --workdir /home/ce-dev/ce-provision --user ce-dev provision-controller $PROVISION_EXEC
+  PROVISION_EXEC="$PROVISION_CMD --python-interpreter /home/ce-dev/ce-python/bin/python3 --repo dummy --branch dummy --workspace /home/ce-dev/ce-provision/ce-dev/ansible --playbook plays/$1/$1.yml --own-branch $2 --config-branch $3 --force"
+  echo "# Running command: $PROVISION_EXEC"
   # shellcheck disable=SC2086
-  sudo docker exec -t --workdir /home/ce-dev/ce-provision --user ce-dev provision-controller $PROVISION_CMD
+  sudo docker exec -t --workdir /home/ce-dev/ce-provision --user ce-dev provision-controller $PROVISION_EXEC
   echo "### $1 project completed ###"
 }
 

ce-dev/ansible/vars/provision/ce_provision.yml

@@ -6,7 +6,7 @@ ce_provision:
   own_repository_branch: "devel-2.x"
   own_repository_skip_checkout: true
   config_repository: "https://github.com/codeenigma/ce-dev-ce-provision-config.git"
-  config_repository_branch: "1.x"
+  config_repository_branch: "devel-2.x"
   config_repository_skip_checkout: true
   local_dir: "/home/ce-dev/ce-provision"
   galaxy_custom_requirements_file: "/home/ce-dev/ce-provision/ce-dev/ansible/vars/provision/galaxy-requirements.yml"

ce-dev/ansible/vars/web/php.yml

@@ -1,3 +1,6 @@
 php:
   version:
-    - 8.1
+    - 8.1
+  # GitHub Actions doesn't make ansible_facts for CPU info available
+  fpm:
+    max_children: 5

ce-dev/ce-dev.compose.yml

@@ -11,6 +11,8 @@ services:
     x-ce_dev: {}
     volumes:
       - ../:/home/ce-dev/ce-provision
+    platform: linux/amd64
+    cgroup: host
   target:
     image: codeenigma/ce-dev-1.x:devel
     x-ce_dev:
@@ -21,6 +23,8 @@ services:
       - 443
     cap_add:
       - NET_ADMIN
+    platform: linux/amd64
+    cgroup: host
   privileged:
     image: codeenigma/ce-dev-1.x:devel
     x-ce_dev:
@@ -32,3 +36,5 @@ services:
       - 443
     cap_add:
       - NET_ADMIN
+    platform: linux/amd64
+    cgroup: host

docs/roles/debian/php-fpm.md

@@ -23,7 +23,7 @@ php:
     # It is important to scale up processes on bigger servers, so that more
     # requests can be handled. Double the number of vCPUs is a good default.
     # Can be between 5 and 64.
-    max_children: "{{ [5, [ansible_facts.processor_vcpus * 2, 64] | min] | max }}"
+    max_children: "{{ [5, [ansible_facts.ansible_processor_nproc * 2, 64] | min] | max }}"
     start_servers: 2
     min_spare_servers: 1
     max_spare_servers: 3

roles/debian/php-common/templates/sury.pref.j2

@@ -1,3 +1,3 @@
 Package: *
 Pin: origin packages.sury.org/deb/
-Pin-Priority: 1101
+Pin-Priority: 1101

roles/debian/php-fpm/README.md

@@ -23,7 +23,7 @@ php:
     # It is important to scale up processes on bigger servers, so that more
     # requests can be handled. Double the number of vCPUs is a good default.
     # Can be between 5 and 64.
-    max_children: "{{ [5, [ansible_facts.processor_vcpus * 2, 64] | min] | max }}"
+    max_children: "{{ [5, [ansible_facts.ansible_processor_nproc * 2, 64] | min] | max }}"
     start_servers: 2
     min_spare_servers: 1
     max_spare_servers: 3

roles/debian/php-fpm/defaults/main.yml

@@ -13,7 +13,7 @@ php:
     # It is important to scale up processes on bigger servers, so that more
     # requests can be handled. Double the number of vCPUs is a good default.
     # Can be between 5 and 64.
-    max_children: "{{ [5, [ansible_facts.processor_vcpus * 2, 64] | min] | max }}"
+    max_children: "{{ [5, [ansible_facts.ansible_processor_nproc * 2, 64] | min] | max }}"
     start_servers: 2
     min_spare_servers: 1
     max_spare_servers: 3

scripts/_common.sh

@@ -154,14 +154,25 @@ cleanup_build_tmp_dir(){
     rm -rf "$BUILD_TMP_DIR"
   fi
 }
+
 # Trigger actual Ansible job.
 ansible_play(){
   if [ -z "$ANSIBLE_PATH" ]; then
     if [ "$LINT" = "yes" ]; then
       # apt repo installed
-      ANSIBLE_BIN=$(command -v ansible-lint)
+      if ! command -v ansible-lint; then
+        echo "### Could not find ansible-lint - Exiting! ###"
+        exit 1
+      else
+        ANSIBLE_BIN=$(command -v ansible-lint)
+      fi
     else
-      ANSIBLE_BIN=$(command -v ansible-playbook)
+      if ! command -v ansible-playbook; then
+        echo "### Could not find ansible-playbook - Exiting! ###"
+        exit 1
+      else
+        ANSIBLE_BIN=$(command -v ansible-playbook)
+      fi
     fi
   else
     if [ "$LINT" = "yes" ]; then