Fix SSG Builds (#178)

Added `python-setuptools` to the required package list Closes #177
simp · Apr 10, 2022 · 3434da8 · 3434da8
1 parent 63f46a4
commit 3434da8
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+### 1.24.3 / 2022-04-10
+* Fixed:
+  * Added python-setuptools to the list of required packages
+
 ### 1.24.2 / 2022-03-09
 * Fixed:
   * Prevent `spec/` directory symlink recursion in `copy_fixture_modules_to`

diff --git a/lib/simp/beaker_helpers/ssg.rb b/lib/simp/beaker_helpers/ssg.rb
@@ -23,11 +23,12 @@ class SSG
       'PyYAML',
       'cmake',
       'git',
-      'openscap-scanner',
       'openscap-python',
+      'openscap-scanner',
       'openscap-utils',
       'python-jinja2',
-      'python-lxml'
+      'python-lxml',
+      'python-setuptools'
     ]
 
     EL8_PACKAGES = [
@@ -41,6 +42,7 @@ class SSG
       'python3-jinja2',
       'python3-lxml',
       'python3-pyyaml',
+      'python3-setuptools',
       'libarchive'
     ]
 

diff --git a/lib/simp/beaker_helpers/version.rb b/lib/simp/beaker_helpers/version.rb
@@ -1,5 +1,5 @@
 module Simp; end
 
 module Simp::BeakerHelpers
-  VERSION = '1.24.2'
+  VERSION = '1.24.3'
 end
diff --git a/spec/acceptance/nodesets/default.yml b/spec/acceptance/nodesets/default.yml
@@ -21,14 +21,6 @@ HOSTS:
     box: generic/centos8
     hypervisor: <%= hypervisor %>
 
-  el8-0:
-    roles:
-      - el8
-    platform: el-8-x86_64
-    box: centos/8
-    box_version: "1905.1"
-    hypervisor: <%= hypervisor %>
-
 CONFIG:
   log_level: verbose
   type: aio