From 591e47e0605c54ab2cdec513cbba9c9f59cfc23a Mon Sep 17 00:00:00 2001
From: Ian Booth <ian.booth@canonical.com>
Date: Fri, 17 Nov 2023 13:31:30 +1000
Subject: [PATCH] Fix typo in ci unit test node; remove centos unit tests

---
 jobs/ci-run/unittest/unittests.yml        | 45 +----------------------
 tests/suites/static_analysis/lint_yaml.sh |  1 -
 2 files changed, 2 insertions(+), 44 deletions(-)

diff --git a/jobs/ci-run/unittest/unittests.yml b/jobs/ci-run/unittest/unittests.yml
index 50eb8ed..2cb88c9 100644
--- a/jobs/ci-run/unittest/unittests.yml
+++ b/jobs/ci-run/unittest/unittests.yml
@@ -46,7 +46,6 @@
 #               current-parameters: true
 #             - name: unit-tests-ppc64el
 #               current-parameters: true
-#             - name: unit-tests-centos9
 #               current-parameters: true
 
 
@@ -73,7 +72,7 @@
 
 - job:
     name: unit-tests-amd64
-    node: ephemeral-github-16c-64g-amd64
+    node: ephemeral-focal-16c-64g-amd64
     description: |-
       Build and run unit tests for amd64.
     wrappers:
@@ -274,7 +273,7 @@
 
 - job:
     name: 'unit-tests-race-amd64'
-    node: ephemeral-github-16c-64g-amd64
+    node: ephemeral-focal-16c-64g-amd64
     description: |-
       Build and run unit race tests for amd64.
     wrappers:
@@ -374,46 +373,6 @@
             results: tests.xml
             allow-empty-results: true
 
-- job:
-    name: 'unit-tests-centos9'
-    description: |-
-      Build and run unit race tests on centos9 for amd64.
-    node: ephemeral-centos9-8c-32g-amd64
-    wrappers:
-      - default-unit-test-wrapper
-    parameters:
-      - validating-string:
-          description: The git short hash for the commit you wish to test
-          name: SHORT_GIT_COMMIT
-          regex: ^\S{7}$
-          msg: Enter a valid 7 char git sha
-      - string:
-          name: USE_TMPFS_FOR_MGO
-          description: "Set to 1 to use a tmpfs volume for hosting mongo data"
-      - string:
-          name: series
-          default: ""
-          description: "Series used for deploying"
-      - string:
-          name: BOOTSTRAP_SERIES
-          default: ""
-          description: "Series to used for bootstrapping"
-      - string:
-          name: GOVERSION
-          default: "1.17"
-          description: "Go version to use for unit tests"
-    builders:
-      - install-go
-      - get-s3-source-payload
-      - set-test-description
-      - shell:
-          !include-raw: ../scripts/centos-unit-test.sh
-    publishers:
-      # centos-unit-test.sh puts the tests.xml file in the right place, no need to grab it.
-      - junit:
-          results: tests.xml
-          allow-empty-results: true
-
 - wrapper:
     name: default-unit-test-wrapper
     wrappers:
diff --git a/tests/suites/static_analysis/lint_yaml.sh b/tests/suites/static_analysis/lint_yaml.sh
index d674f33..582230c 100644
--- a/tests/suites/static_analysis/lint_yaml.sh
+++ b/tests/suites/static_analysis/lint_yaml.sh
@@ -72,7 +72,6 @@ jobs:
     - unit-tests-s390x
     - unit-tests-race-arm64
     - unit-tests-ppc64el
-    - unit-tests-centos9
     - unit-tests-arm64
     - nw-deploy-jammy-s390x-lxd
     - nw-deploy-jammy-ppc64el-lxd