From 0a3e6598b25ea4c488e55b04b6e93ee642d415fa Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Thu, 3 May 2018 14:10:53 -0700 Subject: [PATCH] Update the test blueprints Change versions to match Fedora versions. Add version numbers to the blueprints except for glusterfs.toml, not having a version is used as part of the tests. --- tests/pylorax/blueprints/atlas.toml | 1 + tests/pylorax/blueprints/glusterfs.toml | 6 +++--- tests/pylorax/blueprints/http-server.toml | 16 ++++++++-------- tests/pylorax/blueprints/jboss.toml | 5 +++-- tests/pylorax/blueprints/kubernetes.toml | 11 ++++++----- 5 files changed, 21 insertions(+), 18 deletions(-) diff --git a/tests/pylorax/blueprints/atlas.toml b/tests/pylorax/blueprints/atlas.toml index 1cbb0c24..82a4c5f4 100644 --- a/tests/pylorax/blueprints/atlas.toml +++ b/tests/pylorax/blueprints/atlas.toml @@ -1,5 +1,6 @@ name = "atlas" description = "Automatically Tuned Linear Algebra Software" +version = "0.0.1" [[modules]] name = "atlas" diff --git a/tests/pylorax/blueprints/glusterfs.toml b/tests/pylorax/blueprints/glusterfs.toml index b64fd883..96f50260 100644 --- a/tests/pylorax/blueprints/glusterfs.toml +++ b/tests/pylorax/blueprints/glusterfs.toml @@ -3,12 +3,12 @@ description = "An example GlusterFS server with samba" [[modules]] name = "glusterfs" -version = "3.7.*" +version = "4.0.*" [[modules]] name = "glusterfs-cli" -version = "3.7.*" +version = "4.0.*" [[packages]] name = "samba" -version = "4.2.*" +version = "4.8.*" diff --git a/tests/pylorax/blueprints/http-server.toml b/tests/pylorax/blueprints/http-server.toml index c6d74b1c..63a53bf3 100644 --- a/tests/pylorax/blueprints/http-server.toml +++ b/tests/pylorax/blueprints/http-server.toml @@ -7,8 +7,8 @@ name = "httpd" version = "2.4.*" [[modules]] -name = "mod_auth_kerb" -version = "5.4" +name = "mod_auth_openid" +version = "0.8" [[modules]] name = "mod_ssl" @@ -16,20 +16,20 @@ version = "2.4.*" [[modules]] name = "php" -version = "5.4.*" +version = "7.2.4" [[modules]] -name = "php-mysql" -version = "5.4.*" +name = "php-mysqlnd" +version = "7.2.4" [[packages]] name = "tmux" -version = "2.2" +version = "2.7" [[packages]] name = "openssh-server" -version = "6.6.*" +version = "7.*" [[packages]] name = "rsync" -version = "3.0.*" +version = "3.1.3" diff --git a/tests/pylorax/blueprints/jboss.toml b/tests/pylorax/blueprints/jboss.toml index 9c7090fb..f287323f 100644 --- a/tests/pylorax/blueprints/jboss.toml +++ b/tests/pylorax/blueprints/jboss.toml @@ -1,12 +1,13 @@ name = "jboss" description = "An example jboss server" +version = "0.0.1" [[modules]] -name = "jboss-servlet-3.0-api" +name = "jboss-servlet-3.1-api" version = "1.0.*" [[modules]] -name = "jboss-interceptors-1.1-api" +name = "jboss-interceptors-1.2-api" version = "1.0.*" [[modules]] diff --git a/tests/pylorax/blueprints/kubernetes.toml b/tests/pylorax/blueprints/kubernetes.toml index 08e20bb7..5a65ec3a 100644 --- a/tests/pylorax/blueprints/kubernetes.toml +++ b/tests/pylorax/blueprints/kubernetes.toml @@ -1,25 +1,26 @@ name = "kubernetes" description = "An example kubernetes master" +version = "0.0.1" [[modules]] name = "kubernetes" -version = "1.2.*" +version = "1.9.*" [[modules]] name = "docker" -version = "1.10.*" +version = "1.13.*" [[modules]] name = "docker-lvm-plugin" -version = "1.10.*" +version = "1.13.*" [[modules]] name = "etcd" -version = "2.3.*" +version = "3.2.*" [[modules]] name = "flannel" -version = "0.5.*" +version = "0.9.*" [[packages]] name = "oci-systemd-hook"