tyler.durden/rpm-icingaweb2
1
0
Fork 0
mirror of https://git.icinga.com/packaging/rpm-icingaweb2.git synced 2025-07-29 08:54:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/fedora' into 'master'

Browse Source 
Install httpd for Fedora

See merge request packaging/rpm-icingaweb2!14
This commit is contained in:
Henrik Triem 2021-07-29 13:03:15 +00:00
commit 8c4e575b3e
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@ -95,7 +95,6 @@ test/fedora/34:
<<: *test <<: *test
variables: variables:
DOCKER_IMAGE: fedora/34 DOCKER_IMAGE: fedora/34
allow_failure: true
dependencies: dependencies:
- build/fedora/34 - build/fedora/34
@ -113,7 +112,6 @@ test/fedora/33:
<<: *test <<: *test
variables: variables:
DOCKER_IMAGE: fedora/33 DOCKER_IMAGE: fedora/33
allow_failure: true
dependencies: dependencies:
- build/fedora/33 - build/fedora/33

4
testing/prepare_test.sh
View File

@ -11,6 +11,10 @@ if [ -f /etc/centos-release ] || grep -q 'ID="centos"' /etc/os-release; then
fi fi
fi fi
if [ -f /etc/fedora-release ]; then
sudo yum install -y httpd
fi
if [ -f /etc/os-release ]; then if [ -f /etc/os-release ]; then
source /etc/os-release source /etc/os-release
fi fi