Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SUSE: Update to php8 + Leap 15.4 #238

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'}
Expand All @@ -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'}
Expand Down
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docs/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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``
^^^^^^^^^^^^^^
Expand Down
10 changes: 5 additions & 5 deletions kitchen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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`:
Expand Down Expand Up @@ -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:
Expand Down
60 changes: 28 additions & 32 deletions php/map.jinja
Original file line number Diff line number Diff line change
Expand Up @@ -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': {
Expand Down
2 changes: 1 addition & 1 deletion test/integration/default/controls/package_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
63 changes: 30 additions & 33 deletions test/integration/default/files/_mapdata/opensuse-15.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
63 changes: 30 additions & 33 deletions test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion test/salt/pillar/suse.sls
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
php:
lookup:
pkgs:
php: php7
php: php8