Merge pull request #343 from cPholloway/gh337

Add blocker if cPanel is not running version 110
cpanel · Jan 11, 2024 · 8c5f252 · 8c5f252
2 parents a9b0fb3 + e6e353e
commit 8c5f252
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 10 deletions.
diff --git a/.github/workflows/testsuite.yml b/.github/workflows/testsuite.yml
@@ -15,15 +15,15 @@ jobs:
     env:
       PERL_USE_UNSAFE_INC: 1
       CPANEL_BIN_PATH: /usr/local/cpanel/3rdparty/bin
-      CPANEL_PERL: /usr/local/cpanel/3rdparty/perl/532/bin/perl
+      CPANEL_PERL: /usr/local/cpanel/3rdparty/perl/536/bin/perl
 
     runs-on: ubuntu-latest
 
     strategy:
       fail-fast: false
 
     container:
-      image: cpanelos/perl-compiler:perl-v5.32.0
+      image: cpanelos/perl-compiler:perl-v5.36.0
 
     steps:
       - name: Checkout

diff --git a/changelog b/changelog
@@ -1,3 +1,7 @@
+2024-??-?? - version 19
+- #337 - Add blocker if cPanel is not running version 110
+- Use canonical_dump() when building JSON for repo blocker reports
+
 2024-01-09 - version 18
 - #332 - Suppress additional checks when run with --check --no-leapp
 

diff --git a/elevate-cpanel b/elevate-cpanel
@@ -65,7 +65,7 @@ BEGIN {    # Suppress load of all of these at earliest point.
 
     package Elevate::Constants;
 
-    use constant MINIMUM_LTS_SUPPORTED => 102;
+    use constant MINIMUM_LTS_SUPPORTED => 110;
     use constant MAXIMUM_LTS_SUPPORTED => 110;
 
     use constant SERVICE_DIR  => '/etc/systemd/system/';
@@ -4900,7 +4900,7 @@ BEGIN {
     $Cpanel::Version::Tiny::major_version >= Elevate::Constants::MINIMUM_LTS_SUPPORTED
       or do {
         warn qq[You need to upgrade your cPanel server to version ] . Elevate::Constants::MINIMUM_LTS_SUPPORTED    #
-          . qq[or later before running this script.\n];
+          . qq[ or later before running this script.\n];
         exit 1;
       };
 }

diff --git a/lib/Elevate/Constants.pm b/lib/Elevate/Constants.pm
@@ -14,7 +14,7 @@ if their usage is self contained.
 
 =cut
 
-use constant MINIMUM_LTS_SUPPORTED => 102;
+use constant MINIMUM_LTS_SUPPORTED => 110;
 use constant MAXIMUM_LTS_SUPPORTED => 110;
 
 use constant SERVICE_DIR  => '/etc/systemd/system/';

diff --git a/script/elevate-cpanel.PL b/script/elevate-cpanel.PL
@@ -192,7 +192,7 @@ BEGIN {
     $Cpanel::Version::Tiny::major_version >= Elevate::Constants::MINIMUM_LTS_SUPPORTED
       or do {
         warn qq[You need to upgrade your cPanel server to version ] . Elevate::Constants::MINIMUM_LTS_SUPPORTED    #
-          . qq[or later before running this script.\n];
+          . qq[ or later before running this script.\n];
         exit 1;
       };
 }

diff --git a/t/cpanel-setup b/t/cpanel-setup
@@ -3,7 +3,7 @@
 set -e
 
 ULC=/usr/local/cpanel
-VERSION=11.102.0.1
+VERSION=11.110.0.17
 REPO=$(pwd)
 
 yum clean all
@@ -31,17 +31,17 @@ echo "# ............. setup symlinks"
 ln -sf usr/local/cpanel/scripts /scripts
 ln -sf /bin/true /usr/local/cpanel/bin/build_locale_databases
 ln -sf /bin/true /usr/local/cpanel/scripts/restartsrv_tailwatchd
-ln -sf /usr/local/cpanel/3rdparty/perl/532/bin/perl /usr/local/cpanel/3rdparty/bin/perl
+ln -sf /usr/local/cpanel/3rdparty/perl/536/bin/perl /usr/local/cpanel/3rdparty/bin/perl
 
 echo "CPANEL=${VERSION}" > /etc/cpupdate.conf
 
 echo "# ............. /scripts/fix-cpanel-perl"
-rm -f /usr/local/cpanel/3rdparty/perl/532/bin/perl
+rm -f /usr/local/cpanel/3rdparty/perl/536/bin/perl
 /scripts/fix-cpanel-perl ||:
 
 echo "# ............. which perl"
 which perl
-ls -l /usr/local/cpanel/3rdparty/perl/532/bin/perl
+ls -l /usr/local/cpanel/3rdparty/perl/536/bin/perl
 
 echo "# ............. cpanm round 2"
 #perl bin/cpanm -n Params::Util