Merge pull request #208 from wallyworld/remove-proving-grounds

chore: remove proving grounds tests
juju · Nov 15, 2024 · fb99ab0 · fb99ab0
2 parents dfb4e29 + 488dba4
commit fb99ab0
Show file tree

Hide file tree

Showing 11 changed files with 48 additions and 372 deletions.
diff --git a/jobs/ci-run/ci-run-master.yml b/jobs/ci-run/ci-run-master.yml
@@ -287,15 +287,6 @@
               predefined-parameters: |-
                 SHORT_GIT_COMMIT=${{SHORT_GIT_COMMIT}}
                 GOVERSION=${{GOVERSION}}
-    publishers:
-      - trigger-parameterized-builds:
-          - project: "ci-proving-ground-tests-once-daily"
-            condition: ALWAYS
-            current-parameters: true
-            predefined-parameters: |-
-              series=${{series}}
-              SHORT_GIT_COMMIT=${{SHORT_GIT_COMMIT}}
-              GOVERSION=${{GOVERSION}}
 
 - job:
     name: "package-juju-source"

diff --git a/jobs/ci-run/ci-run-proving-grounds-tests.yml b/jobs/ci-run/ci-run-proving-grounds-tests.yml
diff --git a/jobs/ci-run/integration/gen/test-magma.yml → .../ci-run/integration/gen/test-kubeflow.yml b/jobs/ci-run/integration/gen/test-magma.yml → .../ci-run/integration/gen/test-kubeflow.yml
@@ -2,10 +2,10 @@
 
 # Code generated by gen-wire-tests. DO NOT EDIT.
 - job:
-    name: 'test-magma-multijob'
+    name: 'test-kubeflow-multijob'
     project-type: 'multijob'
     description: |-
-        Test magma Suite
+        Test kubeflow Suite
     condition: SUCCESSFUL
     node: noop-parent-jobs
     concurrent: true
@@ -30,16 +30,16 @@
     - get-build-details
     - set-test-description
     - multijob:
-        name: 'IntegrationTests-magma'
+        name: 'IntegrationTests-kubeflow'
         projects:
-        - name: 'test-magma-test-deploy-magma-microk8s'
+        - name: 'test-kubeflow-test-deploy-kubeflow-microk8s'
           current-parameters: true
 
 - job:
-    name: test-magma-test-deploy-magma-microk8s
+    name: test-kubeflow-test-deploy-kubeflow-microk8s
     node: ephemeral-noble-8c-32g-amd64
     description: |-
-      Test magma suite on microk8s
+      Test kubeflow suite on microk8s
     parameters:
     - validating-string:
         name: SHORT_GIT_COMMIT
@@ -88,17 +88,23 @@
     wrappers:
       - default-integration-test-wrapper
       - timeout:
-          timeout: 90
+          timeout: 50
           fail: true
           type: absolute
     builders:
       - select-oci-registry
       - wait-for-cloud-init
       - prepare-integration-test
-      - run-integration-test-microk8s:
-            test_name: 'magma'
-            setup_steps: ''
-            task_name: ''
-            skip_tasks: ''
+      - conditional-step:
+          condition-kind: regex-match
+          regex: "^[4-9].*|^3\\.([5-9]|\\d{{2,}})(\\.|-).*"
+          label: "${{JUJU_VERSION}}"
+          on-evaluation-failure: "dont-run"
+          steps:
+            - run-integration-test-microk8s:
+                  test_name: 'kubeflow'
+                  setup_steps: ''
+                  task_name: ''
+                  skip_tasks: ''
     publishers:
       - integration-artifacts
diff --git a/jobs/ci-run/integration/gen/test-model-unstable.yml b/jobs/ci-run/integration/gen/test-model-unstable.yml
diff --git a/jobs/ci-run/integration/gen/test-model.yml b/jobs/ci-run/integration/gen/test-model.yml
@@ -74,6 +74,12 @@
           current-parameters: true
         - name: 'test-model-test-model-migration-version-lxd'
           current-parameters: true
+        - name: 'test-model-test-model-multi-aws'
+          current-parameters: true
+        - name: 'test-model-test-model-multi-google'
+          current-parameters: true
+        - name: 'test-model-test-model-multi-lxd'
+          current-parameters: true
         - name: 'test-model-test-model-status-aws'
           current-parameters: true
         - name: 'test-model-test-model-status-google'

diff --git a/jobs/ci-run/integration/integrationtests.yml b/jobs/ci-run/integration/integrationtests.yml
@@ -1,43 +1,3 @@
-- job:
-    name: "integration-tests"
-    project-type: "multijob"
-    description: "Run integration tests"
-    condition: SUCCESSFUL
-    node: noop-parent-jobs
-    concurrent: true
-    wrappers:
-      - ansicolor
-      - workspace-cleanup
-      - timestamps
-      - timeout:
-          timeout: 300
-          fail: true
-          type: absolute
-    parameters:
-      - string:
-          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'
-          name: BOOTSTRAP_SERIES
-    builders:
-      - get-build-details
-      - set-test-description
-      - multijob:
-          name: IntegrationTests
-          projects:
-          - name: gating-integration-tests-amd64
-            current-parameters: true
-          - name: proving-grounds-integration-tests-amd64
-            current-parameters: true
-
-
 - job:
     name: "gating-integration-tests-amd64"
     project-type: "multijob"
@@ -150,6 +110,10 @@
               current-parameters: true
               predefined-parameters: |-
                 BUILD_ARCH=amd64
+            - name: 'test-deploy_caas-multijob'
+              current-parameters: true
+              predefined-parameters: |-
+                BUILD_ARCH=amd64
             - name: 'test-firewall-multijob'
               current-parameters: true
               predefined-parameters: |-
@@ -162,6 +126,10 @@
               current-parameters: true
               predefined-parameters: |-
                 BUILD_ARCH=amd64
+            - name: 'test-kubeflow-multijob'
+              current-parameters: true
+              predefined-parameters: |-
+                BUILD_ARCH=amd64
             - name: 'test-machine-multijob'
               current-parameters: true
               predefined-parameters: |-
@@ -235,58 +203,7 @@
               predefined-parameters: |-
                 BUILD_ARCH=amd64
 
-- job:
-    name: proving-grounds-integration-tests-amd64
-    project-type: "multijob"
-    description: |-
-      intergration-amd64 runs the new shell integration tests.
-    node: noop-parent-jobs
-    concurrent: true
-    wrappers:
-      - default-integration-test-wrapper
-    parameters:
-      - string:
-          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'
-          name: BOOTSTRAP_SERIES
-    builders:
-      - get-build-details
-      - set-test-description
-      - shell: |-
-          echo "BUILD_ARCH=amd64" > build.properties
-      - inject:
-          properties-file: build.properties
-      - multijob:
-          name: proving-grounds-integration-tests-amd64
-          projects:
-            - name: 'test-deploy-unstable-multijob'
-              current-parameters: true
-              predefined-parameters: |-
-                BUILD_ARCH=amd64
-            - name: 'test-deploy_caas-multijob'
-              current-parameters: true
-              predefined-parameters: |-
-                BUILD_ARCH=amd64
-            - name: 'test-kubeflow'
-              current-parameters: true
-              predefined-parameters: |-
-                BUILD_ARCH=amd64
-            - name: 'test-magma-multijob'
-              current-parameters: true
-              predefined-parameters: |-
-                BUILD_ARCH=amd64
-            - name: 'test-model-unstable-multijob'
-              current-parameters: true
-              predefined-parameters: |-
-                BUILD_ARCH=amd64
+
 - job:
     name: "gating-integration-tests-arm64"
     project-type: "multijob"