Version bump to 2.0.18

Azure · Feb 28, 2023 · 3f01ae0 · 3f01ae0
1 parent b338d8f
commit 3f01ae0
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 59 deletions.
diff --git a/README.md b/README.md
@@ -20,12 +20,12 @@ in CycleCloud by specifying the PBSPro OSS version.
 
 Note: When using the cluster that is shipped with CycleCloud, the autoscaler and default queues are already installed.
 
-First, download the installer pkg from GitHub. For example, you can download the [2.0.17 release here](https://github.com/Azure/cyclecloud-pbspro/releases/download/2.0.17/cyclecloud-pbspro-pkg-2.0.17.tar.gz)
+First, download the installer pkg from GitHub. For example, you can download the [2.0.18 release here](https://github.com/Azure/cyclecloud-pbspro/releases/download/2.0.18/cyclecloud-pbspro-pkg-2.0.18.tar.gz)
 
 ```bash
 # Prerequisite: python3, 3.6 or newer, must be installed and in the PATH
-wget https://github.com/Azure/cyclecloud-pbspro/releases/download/2.0.17/cyclecloud-pbspro-pkg-2.0.17.tar.gz
-tar xzf cyclecloud-pbspro-pkg-2.0.17.tar.gz
+wget https://github.com/Azure/cyclecloud-pbspro/releases/download/2.0.18/cyclecloud-pbspro-pkg-2.0.18.tar.gz
+tar xzf cyclecloud-pbspro-pkg-2.0.18.tar.gz
 cd cyclecloud-pbspro
 # Optional, but recommended. Adds relevant resources and enables strict placement
 ./initialize_pbs.sh

diff --git a/pbspro/setup.py b/pbspro/setup.py
@@ -7,7 +7,7 @@
 from setuptools.command.test import Command
 from setuptools.command.test import test as TestCommand  # noqa: N812
 
-__version__ = "2.0.17"
+__version__ = "2.0.18"
 CWD = os.path.dirname(os.path.abspath(__file__))
 
 

diff --git a/pbspro/test/pbspro_test/driver_test.py b/pbspro/test/pbspro_test/driver_test.py
@@ -46,57 +46,6 @@ def test_parse_scheduler_node() -> None:
     assert expected.hostname == actual.hostname
     assert expected.resources == actual.resources
     assert expected.available == actual.available
-    # True: down for longer than 5 minutes
-    actual = parse_scheduler_node(
-        {
-            "name": "tux",
-            "resources_available.ncpus": 4,
-            "state": "down",
-            "last_state_change_time": "'Mon Jan 1 12:34:56 2001'",
-        },
-        get_pbspro_parser().resource_definitions,
-    )
-
-    assert actual.marked_for_deletion
-
-    # True: down and offline for longer than 5 minutes
-    actual = parse_scheduler_node(
-        {
-            "name": "tux",
-            "resources_available.ncpus": 4,
-            "state": "down,offline",
-            "last_state_change_time": "'Mon Jan 1 12:34:56 2001'",
-        },
-        get_pbspro_parser().resource_definitions,
-    )
-
-    assert actual.marked_for_deletion
-
-    # True: down and offline for less than 5 minutes
-    actual = parse_scheduler_node(
-        {
-            "name": "tux",
-            "resources_available.ncpus": 4,
-            "state": "down,offline",
-            "last_state_change_time": time.ctime(),
-        },
-        get_pbspro_parser().resource_definitions,
-    )
-
-    assert actual.marked_for_deletion
-
-    # True: down for less than 5 minutes
-    actual = parse_scheduler_node(
-        {
-            "name": "tux",
-            "resources_available.ncpus": 4,
-            "state": "down",
-            "last_state_change_time": time.ctime(),
-        },
-        get_pbspro_parser().resource_definitions,
-    )
-
-    assert actual.marked_for_deletion
 
 
 def test_down_long_enough() -> None:

diff --git a/project.ini b/project.ini
@@ -2,11 +2,11 @@
 name = pbspro
 label = OpenPBS
 type = scheduler
-version = 2.0.17
+version = 2.0.18
 autoupgrade = true
 
 [blobs]
-Files = cyclecloud-pbspro-pkg-2.0.17.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.18.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
 
 [spec server]
 run_list = role[pbspro_server_role]

diff --git a/specs/default/chef/site-cookbooks/pbspro/attributes/default.rb b/specs/default/chef/site-cookbooks/pbspro/attributes/default.rb
@@ -3,7 +3,7 @@
 #
 # 
 
-default[:pbspro][:autoscale_version] = "2.0.17"
+default[:pbspro][:autoscale_version] = "2.0.18"
 default[:pbspro][:autoscale_installer] = "cyclecloud-pbspro-pkg-#{node[:pbspro][:autoscale_version]}.tar.gz"
 default[:pbspro][:version] = "20.0.1-0"
 default[:pbspro][:slots] = nil

diff --git a/specs/default/chef/site-cookbooks/pbspro/metadata.rb b/specs/default/chef/site-cookbooks/pbspro/metadata.rb
@@ -6,7 +6,7 @@
 license          "MIT"
 description      "Installs/Configures Open PBS Pro"
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          "2.0.17"
+version          "2.0.18"
 depends          "tandem"
 %w{ cganglia cshared cuser cyclecloud }.each {|c| depends c}