Support PBS 22

package.py

@@ -32,11 +32,9 @@ def get_cycle_libs(args: Namespace) -> List[str]:
     ret = [build_sdist()]
 
     scalelib_file = "cyclecloud-scalelib-{}.tar.gz".format(SCALELIB_VERSION)
-    cyclecloud_api_file = f"cyclecloud_api-{CYCLECLOUD_API_VERSION}-py2.py3-none-any.whl".format
+    cyclecloud_api_file = f"cyclecloud_api-{CYCLECLOUD_API_VERSION}-py2.py3-none-any.whl"
 
-    scalelib_url = "https://github.com/Azure/cyclecloud-scalelib/archive/refs/tags/{}.tar.gz".format(
-        SCALELIB_VERSION
-    )
+    scalelib_url = f"https://github.com/Azure/cyclecloud-scalelib/archive/refs/tags/{SCALELIB_VERSION}.tar.gz"
 
     cyclecloud_api_url = f"https://github.com/Azure/cyclecloud-pbspro/releases/download/2023-03-29-bins/{cyclecloud_api_file}"
     to_download = {

project.ini

@@ -6,7 +6,7 @@ version = 2.0.19
 autoupgrade = true
 
 [blobs]
-Files = cyclecloud-pbspro-pkg-2.0.19.tar.gz, hwloc-libs-1.11.9-3.el8.x86_64.rpm, pbspro-execution-18.1.4-0.x86_64.rpm, pbspro-server-18.1.4-0.x86_64.rpm, pbspro-client-18.1.4-0.x86_64.rpm, openpbs-client-20.0.1-0.x86_64.rpm, openpbs-server-20.0.1-0.x86_64.rpm, openpbs-execution-20.0.1-0.x86_64.rpm
+Files = cyclecloud-pbspro-pkg-2.0.19.tar.gz, cyclecloud_api-8.3.1-py2.py3-none-any.whl, hwloc-libs-1.11.9-3.el8.x86_64.rpm, openpbs-client-20.0.1-0.x86_64.rpm, openpbs-client-22.05.11-0.x86_64.rpm, openpbs-client_22.05.11-1_amd64_ubuntu18.04.deb, openpbs-client_22.05.11-1_amd64_ubuntu20.04.deb, openpbs-execution-20.0.1-0.x86_64.rpm, openpbs-execution-22.05.11-0.x86_64.rpm, openpbs-execution_22.05.11-1_amd64_ubuntu18.04.deb, openpbs-execution_22.05.11-1_amd64_ubuntu20.04.deb, openpbs-server-20.0.1-0.x86_64.rpm, openpbs-server-22.05.11-0.x86_64.rpm, openpbs-server_22.05.11-1_amd64_ubuntu18.04.deb, openpbs-server_22.05.11-1_amd64_ubuntu20.04.deb, pbspro-client-18.1.4-0.x86_64.rpm, pbspro-debuginfo-18.1.4-0.x86_64.rpm, pbspro-execution-18.1.4-0.x86_64.rpm, pbspro-server-18.1.4-0.x86_64.rpm
 
 [spec server]
 run_list = role[pbspro_server_role]

specs/default/chef/site-cookbooks/pbspro/recipes/execute.rb

@@ -7,6 +7,7 @@ include_recipe 'pbspro::default'
 pbsprover = node[:pbspro][:version]
 
 plat_ver = node['platform_version'].to_i
+platform = node['platform_family']
 pbsdist = "el#{plat_ver}"
 package_name = node[:pbspro][:package]
 

specs/default/chef/site-cookbooks/pbspro/recipes/login.rb

@@ -7,11 +7,14 @@ include_recipe 'pbspro::default'
 pbsprover = node[:pbspro][:version]
 plat_ver = node['platform_version'].to_i
 pbsdist = "el#{plat_ver}"
+package_name = node[:pbspro][:package]
 
-if pbsprover.to_i < 20 
-  package_name = "pbspro-client-#{pbsprover}.x86_64.rpm"
-else
-  package_name = "openpbs-client-#{pbsprover}.x86_64.rpm"
+if package_name.nil?
+  if pbsprover.to_i < 20 
+    package_name = "pbspro-client-#{pbsprover}.x86_64.rpm"
+  else
+    package_name = "openpbs-client-#{pbsprover}.x86_64.rpm"
+  end
 end
 
 jetpack_download package_name do

specs/default/chef/site-cookbooks/pbspro/recipes/server.rb

@@ -8,6 +8,7 @@ pbsprover = node[:pbspro][:version]
 plat_ver = node['platform_version'].to_i
 pbsdist = "el#{plat_ver}"
 cron_method = node[:pbspro][:cron_method] || "pbs_cron"
+package_name = node[:pbspro][:package]
 
 ignore_workq = node[:pbspro][:queues][:workq][:ignore] || false
 ignore_htcq = node[:pbspro][:queues][:htcq][:ignore] || false
@@ -27,11 +28,12 @@ else
   ignore_queues_arg = ""
 end
 
-
-if pbsprover.to_i < 20 
-  package_name = "pbspro-server-#{pbsprover}.x86_64.rpm"
-else
-  package_name = "openpbs-server-#{pbsprover}.x86_64.rpm"
+if package_name.nil?
+  if pbsprover.to_i < 20 
+    package_name = "pbspro-server-#{pbsprover}.x86_64.rpm"
+  else
+    package_name = "openpbs-server-#{pbsprover}.x86_64.rpm"
+  end
 end
 
 jetpack_download package_name do
@@ -50,6 +52,7 @@ else
   end
 end
 
+
 directory "#{node[:pbspro][:autoscale_project_home]}" do
   owner "root"
   group "root"

templates/openpbs.txt

@@ -348,19 +348,19 @@ Order = 20
         ParameterType = Cloud.Image
         Config.OS = linux
         DefaultValue = almalinux8
-        Config.Filter := Package in {"cycle.image.centos7", "cycle.image.centos8", "almalinux8"}
+        Config.Filter := Package in {"cycle.image.centos7", "almalinux8"}
 
         [[[parameter ImageName]]]
         Label = Compute OS
         ParameterType = Cloud.Image
         Config.OS = linux
         DefaultValue = almalinux8
-        Config.Filter := Package in {"cycle.image.centos7", "cycle.image.centos8", "almalinux8"}
+        Config.Filter := Package in {"cycle.image.centos7", "almalinux8"}
 
         [[[parameter PBSVersion]]]
         Label = PBS Version
         Config.Plugin = pico.form.Dropdown
-        Config.Entries := {[Label="OpenPBS v20, el8-only"; Value="20.0.1-0"], [Label="PBSPro v18, el7-only"; Value="18.1.4-0"]}
+        Config.Entries := {[Label="OpenPBS v22, el8-only"; Value="22.05.11-0"], [Label="OpenPBS v20, el8-only"; Value="20.0.1-0"], [Label="PBSPro v18, el7-only"; Value="18.1.4-0"]}
         DefaultValue = 20.0.1-0
 
         [[[parameter serverClusterInitSpecs]]]