From cfcd82c9a367b8bbce2b29aae0d6dbb30ad0b805 Mon Sep 17 00:00:00 2001 From: CanmingCobble <107056780+CanmingCobble@users.noreply.github.com> Date: Tue, 6 Jun 2023 16:05:31 -0500 Subject: [PATCH] chore: bump launcher version for apptainer synonym for singularity (#881) --- master/internal/rm/dispatcherrm/dispatcher_resource_manager.go | 2 +- master/internal/rm/dispatcherrm/dispatcher_version_checker.go | 2 +- .../rm/dispatcherrm/dispatcher_version_checker_test.go | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/master/internal/rm/dispatcherrm/dispatcher_resource_manager.go b/master/internal/rm/dispatcherrm/dispatcher_resource_manager.go index 239c54efc5c..9df0a9ece83 100644 --- a/master/internal/rm/dispatcherrm/dispatcher_resource_manager.go +++ b/master/internal/rm/dispatcherrm/dispatcher_resource_manager.go @@ -1120,7 +1120,7 @@ func (m *dispatcherResourceManager) startLauncherJob( if tempDispatchID != dispatchID { incompMsg := "HPC Launcher version is below the minimum required. " + - "Update to version 3.2.9 or greater." + "Update to version 3.3.1 or greater." ctx.Log().WithField("allocation-id", msg.AllocationID). WithField("description", msg.Spec.Description). Errorf("Launcher did not honor DispatchID assignment of %s. "+ diff --git a/master/internal/rm/dispatcherrm/dispatcher_version_checker.go b/master/internal/rm/dispatcherrm/dispatcher_version_checker.go index 854157f667a..f31e49b38b4 100644 --- a/master/internal/rm/dispatcherrm/dispatcher_version_checker.go +++ b/master/internal/rm/dispatcherrm/dispatcher_version_checker.go @@ -10,7 +10,7 @@ import ( const versionCheckPeriod = 60 * time.Second -var launcherMinimumVersion = semvar.MustParse("3.2.9") +var launcherMinimumVersion = semvar.MustParse("3.3.1") // periodicallyCheckLauncherVersion checks the launcher version every 60s, logging warnings while // it is out of date and exiting if it finds it is ok. diff --git a/master/internal/rm/dispatcherrm/dispatcher_version_checker_test.go b/master/internal/rm/dispatcherrm/dispatcher_version_checker_test.go index a1016376da2..a6ee16776dd 100644 --- a/master/internal/rm/dispatcherrm/dispatcher_version_checker_test.go +++ b/master/internal/rm/dispatcherrm/dispatcher_version_checker_test.go @@ -10,7 +10,8 @@ import ( func TestCheckLauncherVersion(t *testing.T) { assert.Equal(t, checkLauncherVersion(semver.MustParse("4.1.0")), true) assert.Equal(t, checkLauncherVersion(semver.MustParse("4.1.3-SNAPSHOT")), true) - assert.Equal(t, checkLauncherVersion(semver.MustParse("3.2.9")), true) + assert.Equal(t, checkLauncherVersion(semver.MustParse("3.3.1")), true) + assert.Equal(t, checkLauncherVersion(semver.MustParse("3.2.9")), false) assert.Equal(t, checkLauncherVersion(semver.MustParse("3.2.3")), false) assert.Equal(t, checkLauncherVersion(semver.MustParse("3.2.0")), false) assert.Equal(t, checkLauncherVersion(semver.MustParse("3.1.3")), false)