Merge pull request #214 from wallyworld/remove-obsolete-code

chore: remove obsolete test params and cleanup scripts
juju · Feb 25, 2025 · 1a01f62 · 1a01f62
2 parents 40e9279 + 922c57d
commit 1a01f62
Show file tree

Hide file tree

Showing 34 changed files with 12 additions and 7,205 deletions.
diff --git a/.github/workflows/local-deployment.yml b/.github/workflows/local-deployment.yml
@@ -20,7 +20,7 @@ jobs:
       run: |
         set -euxo pipefail
         juju add-model jenkins
-        juju deploy ch:jenkins --series=focal --config password=password --config plugins=jenkins-multijob-plugin
+        juju deploy ch:jenkins --series=noble --config password=password --config plugins=jenkins-multijob-plugin
         juju wait-for application jenkins --query 'status=="active"'
 
     - name: Deploy juju-qa-jenkins to Jenkins

diff --git a/jobs/ci-run/ci-run-gating-tests.yml b/jobs/ci-run/ci-run-gating-tests.yml
@@ -19,10 +19,6 @@
           name: SHORT_GIT_COMMIT
           regex: ^\S{{7}}$
           msg: Enter a valid 7 char git sha
-      - string:
-          default: ""
-          description: "Series to use with charms in the functional tests"
-          name: series
       - string:
           default: ''
           description: 'Ubuntu series to use when bootstrapping Juju'

diff --git a/jobs/ci-run/ci-run-master.yml b/jobs/ci-run/ci-run-master.yml
@@ -116,7 +116,6 @@
       - inject:
           properties-content: |-
             PATH=/snap/bin:$PATH
-            series=focal
       - get-build-details
       - description-setter:
           description: "${{GITHUB_REPO}} ${{JUJU_VERSION}}:${{SHORT_GIT_COMMIT}} (go ${{GOVERSION}})"
@@ -228,7 +227,6 @@
             condition: SUCCESS
             current-parameters: true
             predefined-parameters: |-
-              series=${{series}}
               SHORT_GIT_COMMIT=${{SHORT_GIT_COMMIT}}
               GOVERSION=${{GOVERSION}}
 
@@ -256,10 +254,6 @@
           description: The git short hash for the commit you wish to test
           regex: ^\S{{7}}$
           msg: Enter a valid 7 char git sha
-      - string:
-          name: series
-          default: ""
-          description: "Series to use with charms in the functional tests"
       - string:
           name: BOOTSTRAP_SERIES
           default: ''
@@ -279,7 +273,6 @@
               current-parameters: true
               predefined-parameters: |-
                 SHORT_GIT_COMMIT=${{SHORT_GIT_COMMIT}}
-                series=${{series}}
                 GOVERSION=${{GOVERSION}}
                 BOOTSTRAP_SERIES=${{BOOTSTRAP_SERIES}}
             - name: "unit-tests"

diff --git a/jobs/ci-run/integration/integrationtests.yml b/jobs/ci-run/integration/integrationtests.yml
@@ -12,10 +12,6 @@
           default: ""
           description: "Enable sub job to be run individually."
           name: SHORT_GIT_COMMIT
-      - string:
-          default: ""
-          description: "Series to use with charms in the integration tests"
-          name: series
       - string:
           default: ''
           description: 'Ubuntu series to use when bootstrapping Juju'
@@ -222,10 +218,6 @@
           default: ""
           description: "Enable sub job to be run individually."
           name: SHORT_GIT_COMMIT
-      - string:
-          default: ""
-          description: "Series to use with charms in the integration tests"
-          name: series
       - string:
           default: ''
           description: 'Ubuntu series to use when bootstrapping Juju'

diff --git a/jobs/ci-run/unittest/unittests.yml b/jobs/ci-run/unittest/unittests.yml
@@ -13,10 +13,6 @@
         default: ""
         description: "Enable sub job to be run individually."
         name: SHORT_GIT_COMMIT
-    - string:
-        name: series
-        default: ""
-        description: "Series used for deploying"
     - string:
         name: BOOTSTRAP_SERIES
         default: ""
@@ -77,10 +73,6 @@
     - 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: ""
@@ -129,10 +121,6 @@
     - 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: ""
@@ -181,10 +169,6 @@
     - 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: ""
@@ -233,10 +217,6 @@
       # we are happy with this, we can set the flag to 1 for the root job.
         default: "1"
         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: ""
@@ -282,10 +262,6 @@
     - 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: ""
@@ -334,10 +310,6 @@
     - 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: ""

diff --git a/jobs/common/pre-reqs.yaml b/jobs/common/pre-reqs.yaml
@@ -247,32 +247,6 @@
         sudo DEBIAN_FRONTEND=noninteractive apt install -y python3-pip;
         sudo pip3 install apache-libcloud;
 
-- builder:
-    name: install-equinix-libs
-    builders:
-    - shell: |-
-        #!/bin/bash
-        set -xeu
-
-        sudo DEBIAN_FRONTEND=noninteractive apt update;
-        sudo DEBIAN_FRONTEND=noninteractive apt install -y python3-pip;
-        sudo pip3 install pytz;
-
-- builder:
-    name: get-lxd-cleanup-scripts
-    builders:
-    - checkout-qa-repo
-    - shell: |-
-        #!/bin/bash
-        set -eux
-
-        cd scripts
-        git checkout origin/main -- jobs/z-jobs/scripts/clean_lxd.py
-        cd ${{WORKSPACE}}
-    - inject:
-        properties-content: |-
-            SCRIPTS_DIR=${{WORKSPACE}}/scripts/jobs/z-jobs/scripts/
-
 - builder:
     name: get-aws-cleanup-scripts
     builders:
@@ -308,37 +282,6 @@
         properties-content: |-
             SCRIPTS_DIR=${{WORKSPACE}}/scripts/jobs/z-jobs/scripts/
 
-- builder:
-    name: get-maas-cleanup-scripts
-    builders:
-    - checkout-qa-repo
-    - shell: |-
-        #!/bin/bash
-        set -eux
-
-        cd scripts
-        git checkout origin/main -- jobs/z-jobs/scripts/clean_maas
-        cd ${{WORKSPACE}}
-    - inject:
-        properties-content: |-
-            SCRIPTS_DIR=${{WORKSPACE}}/scripts/jobs/z-jobs/scripts/clean_maas
-
-- builder:
-    name: get-equinix-cleanup-scripts
-    builders:
-    - checkout-qa-repo
-    - install-equinix-libs
-    - shell: |-
-        #!/bin/bash
-        set -eux
-
-        cd scripts
-        git checkout origin/main -- jobs/z-jobs/scripts/clean_equinix.py
-        cd ${{WORKSPACE}}
-    - inject:
-        properties-content: |-
-            SCRIPTS_DIR=${{WORKSPACE}}/scripts/jobs/z-jobs/scripts/
-
 - builder:
     name: checkout-qa-repo
     builders:

diff --git a/jobs/common/scripts/install-mongo4.4.sh b/jobs/common/scripts/install-mongo4.4.sh
@@ -2,6 +2,13 @@
 
 case $(lsb_release -c -s) in
 
+  noble)
+    wget https://repo.mongodb.org/apt/ubuntu/dists/focal/mongodb-org/4.4/multiverse/binary-amd64/mongodb-org-server_4.4.15_amd64.deb
+    wget https://repo.mongodb.org/apt/ubuntu/dists/focal/mongodb-org/4.4/multiverse/binary-amd64/mongodb-org-mongos_4.4.15_amd64.deb
+    wget https://repo.mongodb.org/apt/ubuntu/dists/focal/mongodb-org/4.4/multiverse/binary-amd64/mongodb-org-shell_4.4.15_amd64.deb
+    sudo dpkg -i *.deb
+    ;;
+
   jammy)
     wget http://security.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2.16_amd64.deb
     wget https://repo.mongodb.org/apt/ubuntu/dists/focal/mongodb-org/4.4/multiverse/binary-amd64/mongodb-org-server_4.4.15_amd64.deb

diff --git a/jobs/infrastructure/clean-slave-environments.yml b/jobs/infrastructure/clean-slave-environments.yml