From c69c76e9c97921303d7e5370b53b138f1a9aba2b Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Tue, 10 Dec 2019 14:10:57 -0800 Subject: [PATCH] tests: Use wildcard versions for packages Chasing updated package versions is silly. We already have other tests to make sure the blueprints support version numbers there is no need to fail a test at the whim of an upstream repo. --- tests/pylorax/blueprints/example-append.toml | 6 ++--- tests/pylorax/blueprints/example-atlas.toml | 4 ++-- .../blueprints/example-custom-base.toml | 2 +- .../pylorax/blueprints/example-glusterfs.toml | 6 ++--- .../blueprints/example-http-server.toml | 16 +++++++------- tests/pylorax/blueprints/example-jboss.toml | 6 ++--- .../blueprints/example-kubernetes.toml | 12 +++++----- tests/pylorax/test_server.py | 22 +++++++++---------- 8 files changed, 37 insertions(+), 37 deletions(-) diff --git a/tests/pylorax/blueprints/example-append.toml b/tests/pylorax/blueprints/example-append.toml index 38938194..279ad0a1 100644 --- a/tests/pylorax/blueprints/example-append.toml +++ b/tests/pylorax/blueprints/example-append.toml @@ -4,15 +4,15 @@ version = "0.0.1" [[packages]] name = "tmux" -version = "2.9a" +version = "*" [[packages]] name = "openssh-server" -version = "8.*" +version = "*" [[packages]] name = "rsync" -version = "3.1.*" +version = "*" [customizations.kernel] append = "nosmt=force" diff --git a/tests/pylorax/blueprints/example-atlas.toml b/tests/pylorax/blueprints/example-atlas.toml index 6d969ee7..749961fb 100644 --- a/tests/pylorax/blueprints/example-atlas.toml +++ b/tests/pylorax/blueprints/example-atlas.toml @@ -4,8 +4,8 @@ version = "0.0.1" [[modules]] name = "atlas" -version = "3.10.*" +version = "*" [[modules]] name = "python3-numpy" -version = "1.15.*" +version = "*" diff --git a/tests/pylorax/blueprints/example-custom-base.toml b/tests/pylorax/blueprints/example-custom-base.toml index f3ac3693..14e1fae3 100644 --- a/tests/pylorax/blueprints/example-custom-base.toml +++ b/tests/pylorax/blueprints/example-custom-base.toml @@ -4,7 +4,7 @@ version = "0.0.1" [[packages]] name = "bash" -version = "5.0.*" +version = "*" [customizations] hostname = "custombase" diff --git a/tests/pylorax/blueprints/example-glusterfs.toml b/tests/pylorax/blueprints/example-glusterfs.toml index 5fe4a20f..00f9912e 100644 --- a/tests/pylorax/blueprints/example-glusterfs.toml +++ b/tests/pylorax/blueprints/example-glusterfs.toml @@ -3,12 +3,12 @@ description = "An example GlusterFS server with samba" [[modules]] name = "glusterfs" -version = "7.*" +version = "*" [[modules]] name = "glusterfs-cli" -version = "7.*" +version = "*" [[packages]] name = "samba" -version = "4.*.*" +version = "*" diff --git a/tests/pylorax/blueprints/example-http-server.toml b/tests/pylorax/blueprints/example-http-server.toml index 87aacf7f..5a19ad79 100644 --- a/tests/pylorax/blueprints/example-http-server.toml +++ b/tests/pylorax/blueprints/example-http-server.toml @@ -4,32 +4,32 @@ version = "0.0.1" [[modules]] name = "httpd" -version = "2.4.*" +version = "*" [[modules]] name = "mod_auth_openid" -version = "0.8" +version = "*" [[modules]] name = "mod_ssl" -version = "2.4.*" +version = "*" [[modules]] name = "php" -version = "7.*" +version = "*" [[modules]] name = "php-mysqlnd" -version = "7.*" +version = "*" [[packages]] name = "tmux" -version = "2.9a" +version = "*" [[packages]] name = "openssh-server" -version = "8.*" +version = "*" [[packages]] name = "rsync" -version = "3.1.*" +version = "*" diff --git a/tests/pylorax/blueprints/example-jboss.toml b/tests/pylorax/blueprints/example-jboss.toml index 73cdcea6..580a5277 100644 --- a/tests/pylorax/blueprints/example-jboss.toml +++ b/tests/pylorax/blueprints/example-jboss.toml @@ -4,12 +4,12 @@ version = "0.0.1" [[modules]] name = "jboss-servlet-3.1-api" -version = "1.0.*" +version = "*" [[modules]] name = "jboss-interceptors-1.2-api" -version = "1.0.*" +version = "*" [[modules]] name = "java-1.8.0-openjdk" -version = "1.8.0.*" +version = "*" diff --git a/tests/pylorax/blueprints/example-kubernetes.toml b/tests/pylorax/blueprints/example-kubernetes.toml index a9076a70..c2e0e429 100644 --- a/tests/pylorax/blueprints/example-kubernetes.toml +++ b/tests/pylorax/blueprints/example-kubernetes.toml @@ -4,24 +4,24 @@ version = "0.0.1" [[modules]] name = "kubernetes" -version = "1.10.*" +version = "*" [[modules]] name = "docker" -version = "1.13.*" +version = "*" [[modules]] name = "docker-lvm-plugin" -version = "1.13.*" +version = "*" [[modules]] name = "etcd" -version = "3.2.*" +version = "*" [[modules]] name = "flannel" -version = "0.9.*" +version = "*" [[packages]] name = "oci-systemd-hook" -version = "0.1.*" +version = "*" diff --git a/tests/pylorax/test_server.py b/tests/pylorax/test_server.py index 02dd97d7..a963ebd7 100644 --- a/tests/pylorax/test_server.py +++ b/tests/pylorax/test_server.py @@ -46,17 +46,17 @@ UTF8_TEST_STRING = "I ο½—π’Šll πŸ‰ΞΏπ˜ π› ο½π”°κœ± π˜π’‰πΈπšœ" # HELPER CONSTANTS -HTTP_GLOB = {"name":"httpd", "version":"2.4.*"} -OPENID_GLOB = {"name":"mod_auth_openid", "version":"0.8"} -MODSSL_GLOB = {"name":"mod_ssl", "version":"2.4.*"} -PHP_GLOB = {"name":"php", "version":"7.*"} -PHPMYSQL_GLOB = {"name": "php-mysqlnd", "version":"7.*"} -OPENSSH_GLOB = {"name":"openssh-server", "version": "8.*"} -RSYNC_GLOB = {"name": "rsync", "version": "3.1.*"} -SAMBA_GLOB = {"name": "samba", "version": "4.*.*"} -TMUX_GLOB = {"name": "tmux", "version": "2.9a"} -GLUSTERFS_GLOB = {"name": "glusterfs", "version": "7.*"} -GLUSTERFSCLI_GLOB = {"name": "glusterfs-cli", "version": "7.*"} +HTTP_GLOB = {"name":"httpd", "version":"*"} +OPENID_GLOB = {"name":"mod_auth_openid", "version":"*"} +MODSSL_GLOB = {"name":"mod_ssl", "version":"*"} +PHP_GLOB = {"name":"php", "version":"*"} +PHPMYSQL_GLOB = {"name": "php-mysqlnd", "version":"*"} +OPENSSH_GLOB = {"name":"openssh-server", "version": "*"} +RSYNC_GLOB = {"name": "rsync", "version": "*"} +SAMBA_GLOB = {"name": "samba", "version": "*"} +TMUX_GLOB = {"name": "tmux", "version": "*"} +GLUSTERFS_GLOB = {"name": "glusterfs", "version": "*"} +GLUSTERFSCLI_GLOB = {"name": "glusterfs-cli", "version": "*"} def get_system_repo():