Add CentOS 8 and Debian 10 support

- Drop support for Debian 9
Azure · Mar 20, 2023 · 55c7a25 · 55c7a25
1 parent 241c199
commit 55c7a25
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 13 deletions.
diff --git a/convoy/fleet.py b/convoy/fleet.py
@@ -2673,7 +2673,7 @@ def _adjust_settings_for_pool_creation(config):
                 shipyard_container_required = False
     elif publisher == 'credativ':
         if offer == 'debian':
-            if sku >= '9':
+            if sku >= '10':
                 allowed = True
     elif publisher == 'openlogic':
         if offer.startswith('centos'):

diff --git a/docs/25-batch-shipyard-platform-image-support.md b/docs/25-batch-shipyard-platform-image-support.md
@@ -20,23 +20,20 @@ container pools.
 | Publisher             | Offer                 | Sku | GPU | IB/RDMA | Native Only | Native Convert |
 |-----------------------|-----------------------|-----|:---:|:-------:|:-----------:|:--------------:|
 | microsoft-azure-batch | centos-container      | 7-4 |  X  |         |      X      |                |
-| microsoft-azure-batch | centos-container      | 7-6 |  X  |         |      X      |                |
 | microsoft-azure-batch | centos-container      | 7-7 |  X  |         |      X      |                |
 | microsoft-azure-batch | centos-container-rdma | 7-4 |  X  |  X (4)  |      X      |                |
-| microsoft-azure-batch | centos-container-rdma | 7-6 |  X  |  X (5)  |      X      |                |
 | microsoft-azure-batch | centos-container-rdma | 7-7 |  X  |  X (5)  |      X      |                |
 | OpenLogic             | CentOS                | 7.4 |  X  |         |             |        X       |
-| OpenLogic             | CentOS                | 7.6 |  X  |         |             |        X       |
 | OpenLogic             | CentOS                | 7.7 |  X  |         |             |        X       |
+| OpenLogic             | CentOS                | 8.0 |  X  |         |             |                |
 | OpenLogic             | CentOS-HPC            | 7.4 |  X  |  X (4)  |             |        X       |
-| OpenLogic             | CentOS-HPC            | 7.6 |  X  |  X (5)  |             |        X       |
 | OpenLogic             | CentOS-HPC            | 7.7 |  X  |  X (5)  |             |        X       |
 
 ### Debian
 
-| Publisher | Offer  | Sku | GPU | IB/RDMA | Native Only | Native Convert |
-|-----------|--------|-----|:---:|:-------:|:-----------:|:--------------:|
-| Credativ  | Debian | 9   |     |         |             |                |
+| Publisher | Offer     | Sku | GPU | IB/RDMA | Native Only | Native Convert |
+|-----------|-----------|-----|:---:|:-------:|:-----------:|:--------------:|
+| Debian    | Debian-10 | 10  |     |         |             |                |
 
 ### SLES
 

diff --git a/scripts/shipyard_federation_bootstrap.sh b/scripts/shipyard_federation_bootstrap.sh
@@ -199,7 +199,7 @@ refresh_package_index() {
             apt-get update
             rc=$?
         elif [ "$PACKAGER" == "yum" ]; then
-            yum makecache -y fast
+            yum makecache -y
             rc=$?
         elif [ "$PACKAGER" == "zypper" ]; then
             zypper -n --gpg-auto-import-keys ref

diff --git a/scripts/shipyard_monitoring_bootstrap.sh b/scripts/shipyard_monitoring_bootstrap.sh
@@ -197,7 +197,7 @@ refresh_package_index() {
             apt-get update
             rc=$?
         elif [ "$PACKAGER" == "yum" ]; then
-            yum makecache -y fast
+            yum makecache -y
             rc=$?
         elif [ "$PACKAGER" == "zypper" ]; then
             zypper -n --gpg-auto-import-keys ref

diff --git a/scripts/shipyard_nodeprep.sh b/scripts/shipyard_nodeprep.sh
@@ -494,7 +494,7 @@ refresh_package_index() {
             apt-get update
             rc=$?
         elif [ "$PACKAGER" == "yum" ]; then
-            yum makecache -y fast
+            yum makecache -y
             rc=$?
         elif [ "$PACKAGER" == "zypper" ]; then
             zypper -n --gpg-auto-import-keys ref

diff --git a/scripts/shipyard_slurm_computenode_nodeprep.sh b/scripts/shipyard_slurm_computenode_nodeprep.sh
@@ -209,7 +209,7 @@ refresh_package_index() {
             apt-get update
             rc=$?
         elif [ "$PACKAGER" == "yum" ]; then
-            yum makecache -y fast
+            yum makecache -y
             rc=$?
         elif [ "$PACKAGER" == "zypper" ]; then
             zypper -n --gpg-auto-import-keys ref

diff --git a/scripts/shipyard_slurm_master_bootstrap.sh b/scripts/shipyard_slurm_master_bootstrap.sh
@@ -244,7 +244,7 @@ refresh_package_index() {
             apt-get update
             rc=$?
         elif [ "$PACKAGER" == "yum" ]; then
-            yum makecache -y fast
+            yum makecache -y
             rc=$?
         elif [ "$PACKAGER" == "zypper" ]; then
             zypper -n --gpg-auto-import-keys ref