From 55d15459bd549f1dcc19be805a3cb0bc56d2acde Mon Sep 17 00:00:00 2001 From: Georg Pfuetzenreuter Date: Sat, 25 Feb 2023 20:02:41 +0100 Subject: [PATCH 1/2] fix(suse): update to php8 Modern openSUSE distributions no longer ship PHP 5 - set defaults to PHP 8 instead. Signed-off-by: Georg Pfuetzenreuter --- docs/README.rst | 2 +- php/map.jinja | 60 +++++++++--------- .../default/controls/package_spec.rb | 2 +- .../default/files/_mapdata/opensuse-15.yaml | 63 +++++++++---------- .../files/_mapdata/opensuse-tumbleweed.yaml | 63 +++++++++---------- test/salt/pillar/suse.sls | 2 +- 6 files changed, 91 insertions(+), 101 deletions(-) diff --git a/docs/README.rst b/docs/README.rst index d20a2663..adb2051a 100644 --- a/docs/README.rst +++ b/docs/README.rst @@ -140,7 +140,7 @@ Installs the php-cache-lite package. ^^^^^^^^^^^^^^ Installs the php-cgi package. -Disabled on opensuse only php5-fastcgi available. +Disabled on openSUSE, as there is only php-fastcgi available. ``php.cli`` ^^^^^^^^^^^^^^ diff --git a/php/map.jinja b/php/map.jinja index 6915fce9..9771061f 100644 --- a/php/map.jinja +++ b/php/map.jinja @@ -3000,47 +3000,43 @@ }, 'Suse': { 'pkgs': { - 'adodb': 'php5-dba', - 'apache2': 'apache2-mod_php5', - 'cli': 'php5', - 'curl': 'php5-curl', - 'fpm': 'php5-fpm', - 'gd': 'php5-gd', - 'imap': 'php5-imap', - 'intl': 'php5-intl', - 'json': 'php5-json', - 'ldap': 'php5-ldap', - 'mbstring': 'php5-mbstring', - 'mcrypt': 'php5-mcrypt', - 'mysql': 'php5-mysql', - 'oauth': 'php5-oauth', - 'pear': 'php5-pear', - 'pgsql': 'php5-pgsql', - 'php': 'php5', - 'snmp': 'php5-snmp', - 'soap': 'php5-soap', - 'sqlite': 'php5-sqlite', - 'suhosin': 'php5-suhosin', - 'xml': ['php5-xmlreader','php5-xmlwriter','php5-xmlrpc'], - 'zip': 'php5-zip', + 'adodb': 'php8-dba', + 'apache2': 'apache2-mod_php8', + 'cli': 'php8', + 'curl': 'php8-curl', + 'fpm': 'php8-fpm', + 'gd': 'php8-gd', + 'imap': 'php8-imap', + 'intl': 'php8-intl', + 'json': 'php8-json', + 'ldap': 'php8-ldap', + 'mbstring': 'php8-mbstring', + 'mcrypt': 'php8-mcrypt', + 'mysql': 'php8-mysql', + 'oauth': 'php8-oauth', + 'pear': 'php8-pear', + 'pgsql': 'php8-pgsql', + 'php': 'php8', + 'snmp': 'php8-snmp', + 'soap': 'php8-soap', + 'sqlite': 'php8-sqlite', + 'suhosin': 'php8-suhosin', + 'xml': ['php8-xmlreader','php8-xmlwriter','php8-xmlrpc'], + 'zip': 'php8-zip', }, 'fpm': { - 'conf': '/etc/php-fpm.conf', - 'ini': '/etc/php.ini', - 'pools': '/etc/php-fpm.d', + 'conf': '/etc/php8/fpm/php-fpm.conf', + 'ini': '/etc/php8/conf.d/salt.ini', + 'pools': '/etc/php8/fpm/php-fpm.d', 'service': 'php-fpm', 'user': 'root', 'group': 'root', 'defaults': { - 'global': { - 'pid': '/var/run/php-fpm/php-fpm.pid', - 'error_log': '/var/log/php-fpm/error.log', - }, - 'include': '/etc/php-fpm.d/*.conf', + 'include': '/etc/php8/fpm/php-fpm.d/*.conf', }, }, 'cli': { - 'ini': '/etc/php.ini', + 'ini': '/etc/php8/cli/php.ini', }, }, 'Arch': { diff --git a/test/integration/default/controls/package_spec.rb b/test/integration/default/controls/package_spec.rb index bd95cb8c..e5b0602a 100644 --- a/test/integration/default/controls/package_spec.rb +++ b/test/integration/default/controls/package_spec.rb @@ -35,7 +35,7 @@ def test_redhat end def test_suse - describe package('php7') do + describe package('php8') do it { should be_installed } end end diff --git a/test/integration/default/files/_mapdata/opensuse-15.yaml b/test/integration/default/files/_mapdata/opensuse-15.yaml index a7a1f552..b8ae2a8a 100644 --- a/test/integration/default/files/_mapdata/opensuse-15.yaml +++ b/test/integration/default/files/_mapdata/opensuse-15.yaml @@ -199,46 +199,43 @@ values: soap.wsdl_cache_ttl: 86400 lookup: cli: - ini: /etc/php.ini + ini: /etc/php8/cli/php.ini fpm: - conf: /etc/php-fpm.conf + conf: /etc/php8/fpm/php-fpm.conf defaults: - global: - error_log: /var/log/php-fpm/error.log - pid: /var/run/php-fpm/php-fpm.pid - include: /etc/php-fpm.d/*.conf + include: /etc/php8/fpm/php-fpm.d/*.conf group: root - ini: /etc/php.ini - pools: /etc/php-fpm.d + ini: /etc/php8/conf.d/salt.ini + pools: /etc/php8/fpm/php-fpm.d service: php-fpm user: root pkgs: - adodb: php5-dba - apache2: apache2-mod_php5 - cli: php5 - curl: php5-curl - fpm: php5-fpm - gd: php5-gd - imap: php5-imap - intl: php5-intl - json: php5-json - ldap: php5-ldap - mbstring: php5-mbstring - mcrypt: php5-mcrypt - mysql: php5-mysql - oauth: php5-oauth - pear: php5-pear - pgsql: php5-pgsql - php: php7 - snmp: php5-snmp - soap: php5-soap - sqlite: php5-sqlite - suhosin: php5-suhosin + adodb: php8-dba + apache2: apache2-mod_php8 + cli: php8 + curl: php8-curl + fpm: php8-fpm + gd: php8-gd + imap: php8-imap + intl: php8-intl + json: php8-json + ldap: php8-ldap + mbstring: php8-mbstring + mcrypt: php8-mcrypt + mysql: php8-mysql + oauth: php8-oauth + pear: php8-pear + pgsql: php8-pgsql + php: php8 + snmp: php8-snmp + soap: php8-soap + sqlite: php8-sqlite + suhosin: php8-suhosin xml: - - php5-xmlreader - - php5-xmlwriter - - php5-xmlrpc - zip: php5-zip + - php8-xmlreader + - php8-xmlwriter + - php8-xmlrpc + zip: php8-zip xcache: ini: defaults: diff --git a/test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml b/test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml index 202fe0d3..ce72a353 100644 --- a/test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml +++ b/test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml @@ -199,46 +199,43 @@ values: soap.wsdl_cache_ttl: 86400 lookup: cli: - ini: /etc/php.ini + ini: /etc/php8/cli/php.ini fpm: - conf: /etc/php-fpm.conf + conf: /etc/php8/fpm/php-fpm.conf defaults: - global: - error_log: /var/log/php-fpm/error.log - pid: /var/run/php-fpm/php-fpm.pid - include: /etc/php-fpm.d/*.conf + include: /etc/php8/fpm/php-fpm.d/*.conf group: root - ini: /etc/php.ini - pools: /etc/php-fpm.d + ini: /etc/php8/conf.d/salt.ini + pools: /etc/php8/fpm/php-fpm.d service: php-fpm user: root pkgs: - adodb: php5-dba - apache2: apache2-mod_php5 - cli: php5 - curl: php5-curl - fpm: php5-fpm - gd: php5-gd - imap: php5-imap - intl: php5-intl - json: php5-json - ldap: php5-ldap - mbstring: php5-mbstring - mcrypt: php5-mcrypt - mysql: php5-mysql - oauth: php5-oauth - pear: php5-pear - pgsql: php5-pgsql - php: php7 - snmp: php5-snmp - soap: php5-soap - sqlite: php5-sqlite - suhosin: php5-suhosin + adodb: php8-dba + apache2: apache2-mod_php8 + cli: php8 + curl: php8-curl + fpm: php8-fpm + gd: php8-gd + imap: php8-imap + intl: php8-intl + json: php8-json + ldap: php8-ldap + mbstring: php8-mbstring + mcrypt: php8-mcrypt + mysql: php8-mysql + oauth: php8-oauth + pear: php8-pear + pgsql: php8-pgsql + php: php8 + snmp: php8-snmp + soap: php8-soap + sqlite: php8-sqlite + suhosin: php8-suhosin xml: - - php5-xmlreader - - php5-xmlwriter - - php5-xmlrpc - zip: php5-zip + - php8-xmlreader + - php8-xmlwriter + - php8-xmlrpc + zip: php8-zip xcache: ini: defaults: diff --git a/test/salt/pillar/suse.sls b/test/salt/pillar/suse.sls index 1f41501e..7bd6a4c2 100644 --- a/test/salt/pillar/suse.sls +++ b/test/salt/pillar/suse.sls @@ -4,4 +4,4 @@ php: lookup: pkgs: - php: php7 + php: php8 From 23543ffa8b79d4d6c3ad0d62646036ae698fc75c Mon Sep 17 00:00:00 2001 From: Georg Pfuetzenreuter Date: Sat, 25 Feb 2023 20:30:26 +0100 Subject: [PATCH 2/2] test(suse): update to Leap 15.4 openSUSE Leap 15.3 is discontinued - test with 15.4 containers instead. Signed-off-by: Georg Pfuetzenreuter --- .gitlab-ci.yml | 4 ++-- .travis.yml | 4 ++-- kitchen.yml | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4ef2071b..2d81b57a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -154,7 +154,7 @@ redhat-centos-stream8-master-py3: {extends: '.test_instance_failure_permitted'} redhat-centos-7-master-py3: {extends: '.test_instance'} redhat-fedora-36-master-py3: {extends: '.test_instance_failure_permitted'} redhat-fedora-35-master-py3: {extends: '.test_instance'} -suse-opensuse-leap-153-master-py3: {extends: '.test_instance'} +suse-opensuse-leap-154-master-py3: {extends: '.test_instance'} suse-opensuse-tmbl-latest-master-py3: {extends: '.test_instance_failure_permitted'} redhat-amazonlinux-2-master-py3: {extends: '.test_instance'} redhat-oraclelinux-8-master-py3: {extends: '.test_instance'} @@ -176,7 +176,7 @@ redhat-rockylinux-8-master-py3: {extends: '.test_instance'} # redhat-oraclelinux-7-3004-1-py3: {extends: '.test_instance'} # redhat-almalinux-8-3004-1-py3: {extends: '.test_instance'} # redhat-rockylinux-8-3004-1-py3: {extends: '.test_instance'} -# suse-opensuse-leap-153-3004-0-py3: {extends: '.test_instance'} +# suse-opensuse-leap-154-3004-0-py3: {extends: '.test_instance'} # suse-opensuse-tmbl-latest-3004-0-py3: {extends: '.test_instance_failure_permitted'} # debian-debian-10-3003-4-py3: {extends: '.test_instance'} # debian-debian-9-3003-4-py3: {extends: '.test_instance'} diff --git a/.travis.yml b/.travis.yml index 7c06a105..dbd8c88f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -106,7 +106,7 @@ jobs: - env: INSTANCE=redhat-centos-7-master-py3 - env: INSTANCE=redhat-fedora-36-master-py3 - env: INSTANCE=redhat-fedora-35-master-py3 - - env: INSTANCE=suse-opensuse-leap-153-master-py3 + - env: INSTANCE=suse-opensuse-leap-154-master-py3 - env: INSTANCE=suse-opensuse-tmbl-latest-master-py3 - env: INSTANCE=redhat-amazonlinux-2-master-py3 - env: INSTANCE=redhat-oraclelinux-8-master-py3 @@ -128,7 +128,7 @@ jobs: # - env: INSTANCE=redhat-oraclelinux-7-3004-1-py3 # - env: INSTANCE=redhat-almalinux-8-3004-1-py3 # - env: INSTANCE=redhat-rockylinux-8-3004-1-py3 - # - env: INSTANCE=suse-opensuse-leap-153-3004-0-py3 + # - env: INSTANCE=suse-opensuse-leap-154-3004-0-py3 # - env: INSTANCE=suse-opensuse-tmbl-latest-3004-0-py3 # - env: INSTANCE=debian-debian-10-3003-4-py3 # - env: INSTANCE=debian-debian-9-3003-4-py3 diff --git a/kitchen.yml b/kitchen.yml index 618078e1..80b0ebfe 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -103,9 +103,9 @@ platforms: - name: fedora-35-master-py3 driver: image: saltimages/salt-master-py3:fedora-35 - - name: opensuse-leap-153-master-py3 + - name: opensuse-leap-154-master-py3 driver: - image: saltimages/salt-master-py3:opensuse-leap-15.3 + image: saltimages/salt-master-py3:opensuse-leap-15.4 # Workaround to avoid intermittent failures on `opensuse-leap-15.3`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: @@ -207,7 +207,7 @@ platforms: image: saltimages/salt-3004.1-py3:rockylinux-8 ## SALT `3004.0` - - name: opensuse-leap-153-3004-0-py3 + - name: opensuse-leap-154-3004-0-py3 driver: image: saltimages/salt-3004.0-py3:opensuse-leap-15.3 # Workaround to avoid intermittent failures on `opensuse-leap-15.3`: @@ -388,9 +388,9 @@ suites: - path: test/integration/default - name: suse includes: - - opensuse-leap-153-master-py3 + - opensuse-leap-154-master-py3 - opensuse-tmbl-latest-master-py3 - - opensuse-leap-153-3004-0-py3 + - opensuse-leap-154-3004-0-py3 - opensuse-tmbl-latest-3004-0-py3 provisioner: state_top: