Merge pull request #1141 from lsst-it/IT-5133/rke-1.5.8

(site/tu) bump rke to 1.5.8
lsst-it · May 14, 2024 · 6e9c27c · 6e9c27c
2 parents 04a6cb0 + 5466e03
commit 6e9c27c
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 4 deletions.
diff --git a/hieradata/site/tu/role/rke.yaml b/hieradata/site/tu/role/rke.yaml
@@ -1,2 +1,3 @@
 ---
 profile::core::docker::version: "24.0.9"
+profile::core::rke::version: "1.5.8"
diff --git a/spec/hosts/nodes/pillan01.tu.lsst.org_spec.rb b/spec/hosts/nodes/pillan01.tu.lsst.org_spec.rb
@@ -39,7 +39,7 @@
       it do
         is_expected.to contain_class('profile::core::rke').with(
           enable_dhcp: true,
-          version: '1.4.6',
+          version: '1.5.8',
         )
       end
 

diff --git a/spec/hosts/nodes/pillan08.tu.lsst.org_spec.rb b/spec/hosts/nodes/pillan08.tu.lsst.org_spec.rb
@@ -42,7 +42,7 @@
       it do
         is_expected.to contain_class('profile::core::rke').with(
           enable_dhcp: true,
-          version: '1.4.6',
+          version: '1.5.8',
         )
       end
 

diff --git a/spec/hosts/nodes/rancher01.tu.lsst.org_spec.rb b/spec/hosts/nodes/rancher01.tu.lsst.org_spec.rb
@@ -32,7 +32,7 @@
 
       it do
         is_expected.to contain_class('profile::core::rke').with(
-          version: '1.4.6',
+          version: '1.5.8',
         )
       end
 

diff --git a/spec/hosts/roles/rke_spec.rb b/spec/hosts/roles/rke_spec.rb
@@ -35,7 +35,7 @@
     )
   end
 
-  if site == 'dev'
+  if (site == 'dev') || (site == 'tu')
     it do
       is_expected.to contain_class('rke').with(
         version: '1.5.8',
-Original file line number
+Diff line change
@@ Expand Up / @@ -32,7 +32,7 @@ @@
           it do
             is_expected.to contain_class('profile::core::rke').with(
-              version: '1.4.6',
+              version: '1.5.8',
             )
           end
@@ Expand Down @@