Generate tests for user secrets and extend timeout to 60mins for test…

…-secrets_iaas-test-secrets-vault-lxd;
juju · Nov 2, 2023 · ac27751 · ac27751
1 parent a56b9cb
commit ac27751
Show file tree

Hide file tree

Showing 3 changed files with 237 additions and 7 deletions.
diff --git a/jobs/ci-run/integration/gen/test-secrets_iaas.yml b/jobs/ci-run/integration/gen/test-secrets_iaas.yml
@@ -40,6 +40,8 @@
           current-parameters: true
         - name: 'test-secrets_iaas-test-secrets-vault-lxd'
           current-parameters: true
+        - name: 'test-secrets_iaas-test-user-secret-drain-lxd'
+          current-parameters: true
 
 - job:
     name: test-secrets_iaas-test-secret-drain-lxd
@@ -111,7 +113,7 @@
             test_name: 'secrets_iaas'
             setup_steps: ''
             task_name: 'test_secret_drain'
-            skip_tasks: 'test_secrets_cmr,test_secrets_juju,test_secrets_vault'
+            skip_tasks: 'test_secrets_cmr,test_secrets_juju,test_secrets_vault,test_user_secret_drain'
     publishers:
       - integration-artifacts
 
@@ -185,7 +187,7 @@
             test_name: 'secrets_iaas'
             setup_steps: ''
             task_name: 'test_secrets_cmr'
-            skip_tasks: 'test_secret_drain,test_secrets_juju,test_secrets_vault'
+            skip_tasks: 'test_secret_drain,test_secrets_juju,test_secrets_vault,test_user_secret_drain'
     publishers:
       - integration-artifacts
 
@@ -259,7 +261,7 @@
             test_name: 'secrets_iaas'
             setup_steps: ''
             task_name: 'test_secrets_juju'
-            skip_tasks: 'test_secret_drain,test_secrets_cmr,test_secrets_vault'
+            skip_tasks: 'test_secret_drain,test_secrets_cmr,test_secrets_vault,test_user_secret_drain'
     publishers:
       - integration-artifacts
 
@@ -320,7 +322,7 @@
     wrappers:
       - default-integration-test-wrapper
       - timeout:
-          timeout: 30
+          timeout: 60
           fail: true
           type: absolute
     builders:
@@ -333,6 +335,80 @@
             test_name: 'secrets_iaas'
             setup_steps: ''
             task_name: 'test_secrets_vault'
-            skip_tasks: 'test_secret_drain,test_secrets_cmr,test_secrets_juju'
+            skip_tasks: 'test_secret_drain,test_secrets_cmr,test_secrets_juju,test_user_secret_drain'
+    publishers:
+      - integration-artifacts
+
+- job:
+    name: test-secrets_iaas-test-user-secret-drain-lxd
+    node: ephemeral-focal-8c-32g-amd64
+    description: |-
+      Test test_user_secret_drain in secrets_iaas suite on lxd
+    parameters:
+    - validating-string:
+        name: SHORT_GIT_COMMIT
+        description: 'Enable sub job to be run individually.'
+        regex: ^\S{7}$
+        msg: Enter a valid 7 char git sha
+    - choice:
+        default: 'amd64'
+        description: 'Build arch used to download the build tar.gz.'
+        name: BUILD_ARCH
+        choices:
+        - amd64
+        - arm64
+        - s390x
+        - ppc64el
+    - choice:
+        default: ''
+        description: 'Arch used to boostrap controller.'
+        name: BOOTSTRAP_ARCH
+        choices:
+        - amd64
+        - arm64
+        - s390x
+        - ppc64el
+    - choice:
+        default: ''
+        description: 'Arch used for hosted models.'
+        name: MODEL_ARCH
+        choices:
+        - amd64
+        - arm64
+        - s390x
+        - ppc64el
+    - string:
+        default: 'lxd'
+        description: 'Cloud to use when bootstrapping Juju'
+        name: BOOTSTRAP_CLOUD
+    - string:
+        default: 'lxd'
+        description: 'Provider to use when bootstrapping Juju'
+        name: BOOTSTRAP_PROVIDER
+    - string:
+        default: ''
+        description: 'Ubuntu series to use when bootstrapping Juju'
+        name: BOOTSTRAP_SERIES
+    - string:
+        default: docker.io/jujuqabot
+        description: "Operator docker image account name."
+        name: PARAM_OPERATOR_IMAGE_ACCOUNT
+    wrappers:
+      - default-integration-test-wrapper
+      - timeout:
+          timeout: 30
+          fail: true
+          type: absolute
+    builders:
+      - inject:
+          properties-content: |-
+            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'
     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
@@ -36,6 +36,10 @@
           current-parameters: true
         - name: 'test-secrets_k8s-test-secrets-microk8s'
           current-parameters: true
+        - name: 'test-secrets_k8s-test-user-secret-drain-microk8s'
+          current-parameters: true
+        - name: 'test-secrets_k8s-test-user-secrets-microk8s'
+          current-parameters: true
 
 - job:
     name: test-secrets_k8s-test-secret-drain-microk8s
@@ -107,7 +111,7 @@
             test_name: 'secrets_k8s'
             setup_steps: ''
             task_name: 'test_secret_drain'
-            skip_tasks: 'test_secrets'
+            skip_tasks: 'test_secrets,test_user_secret_drain,test_user_secrets'
     publishers:
       - integration-artifacts
 
@@ -181,6 +185,154 @@
             test_name: 'secrets_k8s'
             setup_steps: ''
             task_name: 'test_secrets'
-            skip_tasks: 'test_secret_drain'
+            skip_tasks: 'test_secret_drain,test_user_secret_drain,test_user_secrets'
+    publishers:
+      - integration-artifacts
+
+- job:
+    name: test-secrets_k8s-test-user-secret-drain-microk8s
+    node: ephemeral-focal-8c-32g-amd64
+    description: |-
+      Test test_user_secret_drain in secrets_k8s suite on microk8s
+    parameters:
+    - validating-string:
+        name: SHORT_GIT_COMMIT
+        description: 'Enable sub job to be run individually.'
+        regex: ^\S{7}$
+        msg: Enter a valid 7 char git sha
+    - choice:
+        default: 'amd64'
+        description: 'Build arch used to download the build tar.gz.'
+        name: BUILD_ARCH
+        choices:
+        - amd64
+        - arm64
+        - s390x
+        - ppc64el
+    - choice:
+        default: ''
+        description: 'Arch used to boostrap controller.'
+        name: BOOTSTRAP_ARCH
+        choices:
+        - amd64
+        - arm64
+        - s390x
+        - ppc64el
+    - choice:
+        default: ''
+        description: 'Arch used for hosted models.'
+        name: MODEL_ARCH
+        choices:
+        - amd64
+        - arm64
+        - s390x
+        - ppc64el
+    - string:
+        default: 'microk8s'
+        description: 'Cloud to use when bootstrapping Juju'
+        name: BOOTSTRAP_CLOUD
+    - string:
+        default: 'k8s'
+        description: 'Provider to use when bootstrapping Juju'
+        name: BOOTSTRAP_PROVIDER
+    - string:
+        default: ''
+        description: 'Ubuntu series to use when bootstrapping Juju'
+        name: BOOTSTRAP_SERIES
+    - string:
+        default: docker.io/jujuqabot
+        description: "Operator docker image account name."
+        name: PARAM_OPERATOR_IMAGE_ACCOUNT
+    wrappers:
+      - default-integration-test-wrapper
+      - timeout:
+          timeout: 30
+          fail: true
+          type: absolute
+    builders:
+      - inject:
+          properties-content: |-
+            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'
+    publishers:
+      - integration-artifacts
+
+- job:
+    name: test-secrets_k8s-test-user-secrets-microk8s
+    node: ephemeral-focal-8c-32g-amd64
+    description: |-
+      Test test_user_secrets in secrets_k8s suite on microk8s
+    parameters:
+    - validating-string:
+        name: SHORT_GIT_COMMIT
+        description: 'Enable sub job to be run individually.'
+        regex: ^\S{7}$
+        msg: Enter a valid 7 char git sha
+    - choice:
+        default: 'amd64'
+        description: 'Build arch used to download the build tar.gz.'
+        name: BUILD_ARCH
+        choices:
+        - amd64
+        - arm64
+        - s390x
+        - ppc64el
+    - choice:
+        default: ''
+        description: 'Arch used to boostrap controller.'
+        name: BOOTSTRAP_ARCH
+        choices:
+        - amd64
+        - arm64
+        - s390x
+        - ppc64el
+    - choice:
+        default: ''
+        description: 'Arch used for hosted models.'
+        name: MODEL_ARCH
+        choices:
+        - amd64
+        - arm64
+        - s390x
+        - ppc64el
+    - string:
+        default: 'microk8s'
+        description: 'Cloud to use when bootstrapping Juju'
+        name: BOOTSTRAP_CLOUD
+    - string:
+        default: 'k8s'
+        description: 'Provider to use when bootstrapping Juju'
+        name: BOOTSTRAP_PROVIDER
+    - string:
+        default: ''
+        description: 'Ubuntu series to use when bootstrapping Juju'
+        name: BOOTSTRAP_SERIES
+    - string:
+        default: docker.io/jujuqabot
+        description: "Operator docker image account name."
+        name: PARAM_OPERATOR_IMAGE_ACCOUNT
+    wrappers:
+      - default-integration-test-wrapper
+      - timeout:
+          timeout: 30
+          fail: true
+          type: absolute
+    builders:
+      - inject:
+          properties-content: |-
+            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'
     publishers:
       - integration-artifacts
diff --git a/tools/gen-wire-tests/juju.config b/tools/gen-wire-tests/juju.config
@@ -5,6 +5,8 @@ folders:
     test_query_tracing:
       3.2
   timeout:
+    secrets_iaas:
+      test_secrets_vault: 60
     model:
       test_model_migration: 90
       test_model_migration_version: 50