Set min juju version for secret related tests;

juju · Nov 16, 2023 · 4bf389f · 4bf389f
1 parent 1c1c19a
commit 4bf389f
Show file tree

Hide file tree

Showing 3 changed files with 113 additions and 45 deletions.
diff --git a/jobs/ci-run/integration/gen/test-secrets_iaas.yml b/jobs/ci-run/integration/gen/test-secrets_iaas.yml
@@ -109,11 +109,17 @@
             OPERATOR_IMAGE_ACCOUNT=${PARAM_OPERATOR_IMAGE_ACCOUNT}
       - wait-for-cloud-init
       - prepare-integration-test
-      - run-integration-test:
-            test_name: 'secrets_iaas'
-            setup_steps: ''
-            task_name: 'test_secret_drain'
-            skip_tasks: 'test_secrets_cmr,test_secrets_juju,test_secrets_vault,test_user_secret_drain'
+      - conditional-step:
+          condition-kind: regex-match
+          regex: "^[4-9].*|^3\\.([2-9]|\\d{2,})(\\.|-).*"
+          label: "${JUJU_VERSION}"
+          on-evaluation-failure: "dont-run"
+          steps:
+            - run-integration-test:
+                  test_name: 'secrets_iaas'
+                  setup_steps: ''
+                  task_name: 'test_secret_drain'
+                  skip_tasks: 'test_secrets_cmr,test_secrets_juju,test_secrets_vault,test_user_secret_drain'
     publishers:
       - integration-artifacts
 
@@ -183,11 +189,17 @@
             OPERATOR_IMAGE_ACCOUNT=${PARAM_OPERATOR_IMAGE_ACCOUNT}
       - wait-for-cloud-init
       - prepare-integration-test
-      - run-integration-test:
-            test_name: 'secrets_iaas'
-            setup_steps: ''
-            task_name: 'test_secrets_cmr'
-            skip_tasks: 'test_secret_drain,test_secrets_juju,test_secrets_vault,test_user_secret_drain'
+      - conditional-step:
+          condition-kind: regex-match
+          regex: "^[4-9].*|^3\\.([1-9]|\\d{2,})(\\.|-).*"
+          label: "${JUJU_VERSION}"
+          on-evaluation-failure: "dont-run"
+          steps:
+            - run-integration-test:
+                  test_name: 'secrets_iaas'
+                  setup_steps: ''
+                  task_name: 'test_secrets_cmr'
+                  skip_tasks: 'test_secret_drain,test_secrets_juju,test_secrets_vault,test_user_secret_drain'
     publishers:
       - integration-artifacts
 
@@ -257,11 +269,17 @@
             OPERATOR_IMAGE_ACCOUNT=${PARAM_OPERATOR_IMAGE_ACCOUNT}
       - wait-for-cloud-init
       - prepare-integration-test
-      - run-integration-test:
-            test_name: 'secrets_iaas'
-            setup_steps: ''
-            task_name: 'test_secrets_juju'
-            skip_tasks: 'test_secret_drain,test_secrets_cmr,test_secrets_vault,test_user_secret_drain'
+      - conditional-step:
+          condition-kind: regex-match
+          regex: "^[4-9].*|^3\\.([1-9]|\\d{2,})(\\.|-).*"
+          label: "${JUJU_VERSION}"
+          on-evaluation-failure: "dont-run"
+          steps:
+            - run-integration-test:
+                  test_name: 'secrets_iaas'
+                  setup_steps: ''
+                  task_name: 'test_secrets_juju'
+                  skip_tasks: 'test_secret_drain,test_secrets_cmr,test_secrets_vault,test_user_secret_drain'
     publishers:
       - integration-artifacts
 
@@ -331,11 +349,17 @@
             OPERATOR_IMAGE_ACCOUNT=${PARAM_OPERATOR_IMAGE_ACCOUNT}
       - wait-for-cloud-init
       - prepare-integration-test
-      - run-integration-test:
-            test_name: 'secrets_iaas'
-            setup_steps: ''
-            task_name: 'test_secrets_vault'
-            skip_tasks: 'test_secret_drain,test_secrets_cmr,test_secrets_juju,test_user_secret_drain'
+      - conditional-step:
+          condition-kind: regex-match
+          regex: "^[4-9].*|^3\\.([1-9]|\\d{2,})(\\.|-).*"
+          label: "${JUJU_VERSION}"
+          on-evaluation-failure: "dont-run"
+          steps:
+            - run-integration-test:
+                  test_name: 'secrets_iaas'
+                  setup_steps: ''
+                  task_name: 'test_secrets_vault'
+                  skip_tasks: 'test_secret_drain,test_secrets_cmr,test_secrets_juju,test_user_secret_drain'
     publishers:
       - integration-artifacts
 
@@ -405,10 +429,16 @@
             OPERATOR_IMAGE_ACCOUNT=${PARAM_OPERATOR_IMAGE_ACCOUNT}
       - wait-for-cloud-init
       - prepare-integration-test
-      - run-integration-test:
-            test_name: 'secrets_iaas'
-            setup_steps: ''
-            task_name: 'test_user_secret_drain'
-            skip_tasks: 'test_secret_drain,test_secrets_cmr,test_secrets_juju,test_secrets_vault'
+      - conditional-step:
+          condition-kind: regex-match
+          regex: "^[4-9].*|^3\\.([3-9]|\\d{2,})(\\.|-).*"
+          label: "${JUJU_VERSION}"
+          on-evaluation-failure: "dont-run"
+          steps:
+            - run-integration-test:
+                  test_name: 'secrets_iaas'
+                  setup_steps: ''
+                  task_name: 'test_user_secret_drain'
+                  skip_tasks: 'test_secret_drain,test_secrets_cmr,test_secrets_juju,test_secrets_vault'
     publishers:
       - integration-artifacts
diff --git a/jobs/ci-run/integration/gen/test-secrets_k8s.yml b/jobs/ci-run/integration/gen/test-secrets_k8s.yml
@@ -107,11 +107,17 @@
             OPERATOR_IMAGE_ACCOUNT=${PARAM_OPERATOR_IMAGE_ACCOUNT}
       - wait-for-cloud-init
       - prepare-integration-test
-      - run-integration-test-microk8s:
-            test_name: 'secrets_k8s'
-            setup_steps: ''
-            task_name: 'test_secret_drain'
-            skip_tasks: 'test_secrets,test_user_secret_drain,test_user_secrets'
+      - conditional-step:
+          condition-kind: regex-match
+          regex: "^[4-9].*|^3\\.([2-9]|\\d{2,})(\\.|-).*"
+          label: "${JUJU_VERSION}"
+          on-evaluation-failure: "dont-run"
+          steps:
+            - run-integration-test-microk8s:
+                  test_name: 'secrets_k8s'
+                  setup_steps: ''
+                  task_name: 'test_secret_drain'
+                  skip_tasks: 'test_secrets,test_user_secret_drain,test_user_secrets'
     publishers:
       - integration-artifacts
 
@@ -181,11 +187,17 @@
             OPERATOR_IMAGE_ACCOUNT=${PARAM_OPERATOR_IMAGE_ACCOUNT}
       - wait-for-cloud-init
       - prepare-integration-test
-      - run-integration-test-microk8s:
-            test_name: 'secrets_k8s'
-            setup_steps: ''
-            task_name: 'test_secrets'
-            skip_tasks: 'test_secret_drain,test_user_secret_drain,test_user_secrets'
+      - conditional-step:
+          condition-kind: regex-match
+          regex: "^[4-9].*|^3\\.([1-9]|\\d{2,})(\\.|-).*"
+          label: "${JUJU_VERSION}"
+          on-evaluation-failure: "dont-run"
+          steps:
+            - run-integration-test-microk8s:
+                  test_name: 'secrets_k8s'
+                  setup_steps: ''
+                  task_name: 'test_secrets'
+                  skip_tasks: 'test_secret_drain,test_user_secret_drain,test_user_secrets'
     publishers:
       - integration-artifacts
 
@@ -255,11 +267,17 @@
             OPERATOR_IMAGE_ACCOUNT=${PARAM_OPERATOR_IMAGE_ACCOUNT}
       - wait-for-cloud-init
       - prepare-integration-test
-      - run-integration-test-microk8s:
-            test_name: 'secrets_k8s'
-            setup_steps: ''
-            task_name: 'test_user_secret_drain'
-            skip_tasks: 'test_secret_drain,test_secrets,test_user_secrets'
+      - conditional-step:
+          condition-kind: regex-match
+          regex: "^[4-9].*|^3\\.([3-9]|\\d{2,})(\\.|-).*"
+          label: "${JUJU_VERSION}"
+          on-evaluation-failure: "dont-run"
+          steps:
+            - run-integration-test-microk8s:
+                  test_name: 'secrets_k8s'
+                  setup_steps: ''
+                  task_name: 'test_user_secret_drain'
+                  skip_tasks: 'test_secret_drain,test_secrets,test_user_secrets'
     publishers:
       - integration-artifacts
 
@@ -329,10 +347,16 @@
             OPERATOR_IMAGE_ACCOUNT=${PARAM_OPERATOR_IMAGE_ACCOUNT}
       - wait-for-cloud-init
       - prepare-integration-test
-      - run-integration-test-microk8s:
-            test_name: 'secrets_k8s'
-            setup_steps: ''
-            task_name: 'test_user_secrets'
-            skip_tasks: 'test_secret_drain,test_secrets,test_user_secret_drain'
+      - conditional-step:
+          condition-kind: regex-match
+          regex: "^[4-9].*|^3\\.([3-9]|\\d{2,})(\\.|-).*"
+          label: "${JUJU_VERSION}"
+          on-evaluation-failure: "dont-run"
+          steps:
+            - run-integration-test-microk8s:
+                  test_name: 'secrets_k8s'
+                  setup_steps: ''
+                  task_name: 'test_user_secrets'
+                  skip_tasks: 'test_secret_drain,test_secrets,test_user_secret_drain'
     publishers:
       - integration-artifacts
diff --git a/tools/gen-wire-tests/juju.config b/tools/gen-wire-tests/juju.config
@@ -4,6 +4,20 @@ folders:
       3.2
     test_query_tracing:
       3.2
+    test_secrets_cmr:
+      3.1
+    test_secrets_juju:
+      3.1
+    test_secrets_vault:
+      3.1
+    test_secrets:
+      3.1
+    test_secret_drain:
+      3.2
+    test_user_secret_drain:
+      3.3
+    test_user_secrets:
+      3.3
   timeout:
     secrets_iaas:
       test_secrets_vault: 60