From cd6f4fdb67177f181218e6bd7778c9efb299da67 Mon Sep 17 00:00:00 2001 From: Alexander Todorov Date: Tue, 27 Nov 2018 16:34:56 +0200 Subject: [PATCH] Drop minor version from php package in blueprint there's 7.2 in Fedora 29 (which we use in Jenkins) and 7.3 in Rawhide which causes test jobs to fail with unsolved dependencies. Alternatively we can switch to another recipe for cloud image tests. --- tests/pylorax/blueprints/example-http-server.toml | 4 ++-- tests/pylorax/test_server.py | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/pylorax/blueprints/example-http-server.toml b/tests/pylorax/blueprints/example-http-server.toml index f1a29780..6f4bccb9 100644 --- a/tests/pylorax/blueprints/example-http-server.toml +++ b/tests/pylorax/blueprints/example-http-server.toml @@ -16,11 +16,11 @@ version = "2.4.*" [[modules]] name = "php" -version = "7.3.*" +version = "7.*" [[modules]] name = "php-mysqlnd" -version = "7.3.*" +version = "7.*" [[packages]] name = "tmux" diff --git a/tests/pylorax/test_server.py b/tests/pylorax/test_server.py index 1574fc3a..b1495678 100644 --- a/tests/pylorax/test_server.py +++ b/tests/pylorax/test_server.py @@ -156,8 +156,8 @@ class ServerTestCase(unittest.TestCase): "modules":[{"name":"httpd", "version":"2.4.*"}, {"name":"mod_auth_openid", "version":"0.8"}, {"name":"mod_ssl", "version":"2.4.*"}, - {"name":"php", "version":"7.3.*"}, - {"name": "php-mysqlnd", "version":"7.3.*"}], + {"name":"php", "version":"7.*"}, + {"name": "php-mysqlnd", "version":"7.*"}], "name":"example-http-server", "packages": [{"name":"openssh-server", "version": "7.*"}, {"name": "rsync", "version": "3.1.*"}, @@ -184,8 +184,8 @@ class ServerTestCase(unittest.TestCase): "modules":[{"name":"httpd", "version":"2.4.*"}, {"name":"mod_auth_openid", "version":"0.8"}, {"name":"mod_ssl", "version":"2.4.*"}, - {"name":"php", "version":"7.3.*"}, - {"name": "php-mysqlnd", "version":"7.3.*"}], + {"name":"php", "version":"7.*"}, + {"name": "php-mysqlnd", "version":"7.*"}], "name":"example-http-server", "packages": [{"name":"openssh-server", "version": "7.*"}, {"name": "rsync", "version": "3.1.*"},