Replace CentOS 8 with Rocky 8

treydock · Apr 5, 2022 · eecb655 · eecb655
1 parent b1cd2c2
commit eecb655
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 10 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -48,7 +48,7 @@ jobs:
       matrix:
         set:
           - "centos-7"
-          - "centos-8"
+          - "rocky-8"
           - "debian-9"
           - "debian-10"
           - "ubuntu-1804"

diff --git a/.sync.yml b/.sync.yml
@@ -3,7 +3,7 @@
   acceptance_matrix:
     set:
       - centos-7
-      - centos-8
+      - rocky-8
       - debian-9
       - debian-10
       - ubuntu-1804

diff --git a/README.md b/README.md
@@ -200,7 +200,7 @@ The `globus_info` fact exposes the information stored in `/var/lib/globus-connec
 Tested using
 
 * RedHat/CentOS 7
-* RedHat/CentOS 8
+* RedHat/Rocky 8
 * Debian 9
 * Debian 10
 * Ubuntu 18.04

diff --git a/metadata.json b/metadata.json
@@ -44,7 +44,12 @@
     {
       "operatingsystem": "CentOS",
       "operatingsystemrelease": [
-        "7",
+        "7"
+      ]
+    },
+    {
+      "operatingsystem": "Rocky",
+      "operatingsystemrelease": [
         "8"
       ]
     },
@@ -75,7 +80,7 @@
     "gridftp",
     "hpc"
   ],
-  "pdk-version": "1.17.0",
+  "pdk-version": "2.1.0",
   "template-url": "https://github.com/treydock/pdk-templates.git#master",
-  "template-ref": "heads/master-0-gad5f473"
+  "template-ref": "heads/master-0-g3b13f94"
 }
diff --git a/spec/acceptance/nodesets/centos-8.yml → spec/acceptance/nodesets/rocky-8.yml b/spec/acceptance/nodesets/centos-8.yml → spec/acceptance/nodesets/rocky-8.yml
@@ -1,10 +1,10 @@
 HOSTS:
-  centos-8:
+  rocky-8:
     roles:
       - agent
     platform: el-8-x86_64
     hypervisor: docker
-    image: centos:8
+    image: rockylinux/rockylinux:8
     docker_preserve_image: true
     docker_cmd:
       - '/usr/sbin/init'

diff --git a/spec/acceptance/nodesets/ubuntu-1804.yml b/spec/acceptance/nodesets/ubuntu-1804.yml
@@ -9,7 +9,7 @@ HOSTS:
     docker_cmd: '["/sbin/init"]'
     docker_image_commands:
       - "rm -f /etc/dpkg/dpkg.cfg.d/excludes"
-      - 'apt-get install -y wget net-tools locales apt-transport-https ca-certificates'
+      - 'apt-get install -y wget net-tools iproute2 locales apt-transport-https ca-certificates'
       - 'locale-gen en_US.UTF-8'
     docker_env:
       - LANG=en_US.UTF-8

diff --git a/spec/acceptance/nodesets/ubuntu-2004.yml b/spec/acceptance/nodesets/ubuntu-2004.yml
@@ -9,7 +9,7 @@ HOSTS:
     docker_cmd: '["/sbin/init"]'
     docker_image_commands:
       - "rm -f /etc/dpkg/dpkg.cfg.d/excludes"
-      - 'apt-get install -y wget net-tools locales apt-transport-https ca-certificates'
+      - 'apt-get install -y wget net-tools iproute2 locales apt-transport-https ca-certificates'
       - 'locale-gen en_US.UTF-8'
     docker_env:
       - LANG=en_US.UTF-8