Added delay step 3 to give time for MCAD to process subtrees.

dmatch01 · dmatch01 · commit 07e57df20ca2 · 2023-03-13T07:08:02.000-07:00
Signed-off-by: dmatch01 &lt;darroyo@us.ibm.com&gt;
diff --git a/test/e2e-kuttl/quota-forest/03-assert.yaml b/test/e2e-kuttl/quota-forest/03-assert.yaml
@@ -1,17 +1,8 @@
-# Verify AppWrapper was dispatched and pod was created
-apiVersion: mcad.ibm.com/v1beta1
-kind: AppWrapper
+# Verify delay step
+apiVersion: batch/v1
+kind: Job
 metadata:
-  name: job3-1replica
+  name: job-delay-step
   namespace: test
-  labels:
-    quota_context: "gold"
-    quota_service: "service-root"
 status:
-  state: Running
----
-apiVersion: v1
-kind: Pod
-metadata:
-  name: job3-1replica-0
-  namespace: test
+  succeeded: 1
diff --git a/test/e2e-kuttl/quota-forest/03-install.yaml b/test/e2e-kuttl/quota-forest/03-install.yaml
@@ -1,50 +1,15 @@
-apiVersion: mcad.ibm.com/v1beta1
-kind: AppWrapper
+apiVersion: batch/v1
+kind: Job
 metadata:
-  name: job3-1replica
+  name: job-delay-step
   namespace: test
-  labels:
-    quota_context: "gold"
-    quota_service: "service-root"
 spec:
-  service:
-    spec: {}
-  resources:
-    metadata: {}
-    Items: []
-    GenericItems:
-      - metadata: {}
-        replicas: 1
-        generictemplate:
-          apiVersion: apps/v1 # for versions before 1.9.0 use apps/v1beta2
-          kind: StatefulSet
-          metadata:
-            name: job3-1replica
-            namespace: test
-            labels:
-              app: job3-1replica
-          spec:
-            selector:
-              matchLabels:
-                app: job3-1replica
-            replicas: 1
-            template:
-              metadata:
-                labels:
-                  app: job3-1replica
-                  size: "1"
-              spec:
-                containers:
-                  - name: job3-1replica
-                    image: registry.access.redhat.com/ubi8/ubi:latest
-                    command:
-                      - /bin/sh
-                      - -c
-                      - while true; do sleep 10; done
-                    resources:
-                      requests:
-                        cpu: "0.6"
-                        memory: "95Mi"
-                      limits:
-                        cpu: "0.6"
-                        memory: "95Mi"
+  template:
+    spec:
+      containers:
+        - name: job-delay-step
+          image: ubuntu:latest
+          command: [ "/bin/bash", "-c", "--" ]
+          args: [ "sleep 10;" ]
+      restartPolicy: Never
+  backoffLimit: 4
diff --git a/test/e2e-kuttl/quota-forest/04-assert.yaml b/test/e2e-kuttl/quota-forest/04-assert.yaml
@@ -1,11 +1,17 @@
-# Verify that quota management is enabled by checking the queuing is happening (e.g. no available quota for quota ids provided in AW)
+# Verify AppWrapper was dispatched and pod was created
 apiVersion: mcad.ibm.com/v1beta1
 kind: AppWrapper
 metadata:
-  name: job4-10replica
+  name: job-gold-lo-pri-1replica
   namespace: test
   labels:
-    quota_context: "context-root2"
-    quota_service: "service-root2"
+    quota_context: "gold"
+    quota_service: "service-root"
 status:
-  state: Pending
+  state: Running
+---
+apiVersion: v1
+kind: Pod
+metadata:
+  name: job-gold-lo-pri-1replica-0
+  namespace: test
diff --git a/test/e2e-kuttl/quota-forest/04-install.yaml b/test/e2e-kuttl/quota-forest/04-install.yaml
@@ -1,49 +1,50 @@
 apiVersion: mcad.ibm.com/v1beta1
 kind: AppWrapper
 metadata:
-  name: job4-10replica
+  name: job-gold-lo-pri-1replica
   namespace: test
   labels:
-    quota_context: "context-root2"
-    quota_service: "service-root2"
+    quota_context: "gold"
+    quota_service: "service-root"
 spec:
   service:
     spec: {}
   resources:
     metadata: {}
+    Items: []
     GenericItems:
       - metadata: {}
         replicas: 1
         generictemplate:
           apiVersion: apps/v1 # for versions before 1.9.0 use apps/v1beta2
           kind: StatefulSet
           metadata:
-            name: job4-10replica
+            name: job-gold-lo-pri-1replica
             namespace: test
             labels:
-              app: job4-10replica
+              app: job-gold-lo-pri-1replica
           spec:
             selector:
               matchLabels:
-                app: job4-10replica
-            replicas: 10
+                app: job-gold-lo-pri-1replica
+            replicas: 1
             template:
               metadata:
                 labels:
-                  app: job4-10replica
+                  app: job-gold-lo-pri-1replica
                   size: "1"
               spec:
                 containers:
-                  - name: job4-10replica
+                  - name: job-gold-lo-pri-1replica
                     image: registry.access.redhat.com/ubi8/ubi:latest
                     command:
                       - /bin/sh
                       - -c
                       - while true; do sleep 10; done
                     resources:
                       requests:
-                        cpu: "0.1"
+                        cpu: "0.6"
                         memory: "95Mi"
                       limits:
-                        cpu: "0.1"
+                        cpu: "0.6"
                         memory: "95Mi"
diff --git a/test/e2e-kuttl/quota-forest/05-assert.yaml b/test/e2e-kuttl/quota-forest/05-assert.yaml
@@ -1,39 +1,11 @@
-# Verify that quota management preempted lower priority job
+# Verify that quota management is enabled by checking the queuing is happening (e.g. no available quota for quota ids provided in AW)
 apiVersion: mcad.ibm.com/v1beta1
 kind: AppWrapper
 metadata:
-  name: job5-1replica
-  namespace: test
-  labels:
-    quota_context: "gold"
-    quota_service: "service-root"
-status:
-  state: Running
----
-apiVersion: v1
-kind: Pod
-metadata:
-  name: job5-1replica-0
-  namespace: test
----
-apiVersion: mcad.ibm.com/v1beta1
-kind: AppWrapper
-metadata:
-  name: job4-10replica
+  name: job-bad-quota-id-10replica
   namespace: test
   labels:
     quota_context: "context-root2"
     quota_service: "service-root2"
 status:
   state: Pending
----
-apiVersion: mcad.ibm.com/v1beta1
-kind: AppWrapper
-metadata:
-  name: job3-1replica
-  namespace: test
-  labels:
-    quota_context: "gold"
-    quota_service: "service-root"
-status:
-  state: Pending
diff --git a/test/e2e-kuttl/quota-forest/05-install.yaml b/test/e2e-kuttl/quota-forest/05-install.yaml
@@ -1,15 +1,14 @@
 apiVersion: mcad.ibm.com/v1beta1
 kind: AppWrapper
 metadata:
-  name: job5-1replica
+  name: job-bad-quota-id-10replica
   namespace: test
   labels:
-    quota_context: "gold"
-    quota_service: "service-root"
+    quota_context: "context-root2"
+    quota_service: "service-root2"
 spec:
   service:
     spec: {}
-  priority: 1000
   resources:
     metadata: {}
     GenericItems:
@@ -19,32 +18,32 @@ spec:
           apiVersion: apps/v1 # for versions before 1.9.0 use apps/v1beta2
           kind: StatefulSet
           metadata:
-            name: job5-1replica
+            name: job-bad-quota-id-10replica
             namespace: test
             labels:
-              app: job5-1replica
+              app: job-bad-quota-id-10replica
           spec:
             selector:
               matchLabels:
-                app: job5-1replica
-            replicas: 1
+                app: job-bad-quota-id-10replica
+            replicas: 10
             template:
               metadata:
                 labels:
-                  app: job5-1replica
+                  app: job-bad-quota-id-10replica
                   size: "1"
               spec:
                 containers:
-                  - name: job5-1replica
+                  - name: job-bad-quota-id-10replica
                     image: registry.access.redhat.com/ubi8/ubi:latest
                     command:
                       - /bin/sh
                       - -c
                       - while true; do sleep 10; done
                     resources:
                       requests:
-                        cpu: "0.6"
+                        cpu: "0.1"
                         memory: "95Mi"
                       limits:
-                        cpu: "0.6"
+                        cpu: "0.1"
                         memory: "95Mi"
diff --git a/test/e2e-kuttl/quota-forest/06-assert.yaml b/test/e2e-kuttl/quota-forest/06-assert.yaml
@@ -1,25 +1,8 @@
-# Verify that quota management is enabled using different quota ids
+# Verify that quota management preempted lower priority job
 apiVersion: mcad.ibm.com/v1beta1
 kind: AppWrapper
 metadata:
-  name: job6-1replica
-  namespace: test
-  labels:
-    quota_context: "bronze"
-    quota_service: "service-root"
-status:
-  state: Running
----
-apiVersion: v1
-kind: Pod
-metadata:
-  name: job6-1replica-0
-  namespace: test
----
-apiVersion: mcad.ibm.com/v1beta1
-kind: AppWrapper
-metadata:
-  name: job5-1replica
+  name: job-gold-high-pri-1replica
   namespace: test
   labels:
     quota_context: "gold"
@@ -30,13 +13,13 @@ status:
 apiVersion: v1
 kind: Pod
 metadata:
-  name: job5-1replica-0
+  name: job-gold-high-pri-1replica-0
   namespace: test
 ---
 apiVersion: mcad.ibm.com/v1beta1
 kind: AppWrapper
 metadata:
-  name: job4-10replica
+  name: job-bad-quota-id-10replica
   namespace: test
   labels:
     quota_context: "context-root2"
@@ -47,7 +30,7 @@ status:
 apiVersion: mcad.ibm.com/v1beta1
 kind: AppWrapper
 metadata:
-  name: job3-1replica
+  name: job-gold-lo-pri-1replica
   namespace: test
   labels:
     quota_context: "gold"
diff --git a/test/e2e-kuttl/quota-forest/06-install.yaml b/test/e2e-kuttl/quota-forest/06-install.yaml
@@ -1,10 +1,10 @@
 apiVersion: mcad.ibm.com/v1beta1
 kind: AppWrapper
 metadata:
-  name: job6-1replica
+  name: job-gold-high-pri-1replica
   namespace: test
   labels:
-    quota_context: "bronze"
+    quota_context: "gold"
     quota_service: "service-root"
 spec:
   service:
@@ -19,32 +19,32 @@ spec:
           apiVersion: apps/v1 # for versions before 1.9.0 use apps/v1beta2
           kind: StatefulSet
           metadata:
-            name: job6-1replica
+            name: job-gold-high-pri-1replica
             namespace: test
             labels:
-              app: job6-1replica
+              app: job-gold-high-pri-1replica
           spec:
             selector:
               matchLabels:
-                app: job6-1replica
+                app: job-gold-high-pri-1replica
             replicas: 1
             template:
               metadata:
                 labels:
-                  app: job6-1replica
+                  app: job-gold-high-pri-1replica
                   size: "1"
               spec:
                 containers:
-                  - name: job6-1replica
+                  - name: job-gold-high-pri-1replica
                     image: registry.access.redhat.com/ubi8/ubi:latest
                     command:
                       - /bin/sh
                       - -c
                       - while true; do sleep 10; done
                     resources:
                       requests:
-                        cpu: "0.4"
+                        cpu: "0.6"
                         memory: "95Mi"
                       limits:
-                        cpu: "0.4"
+                        cpu: "0.6"
                         memory: "95Mi"
diff --git a/test/e2e-kuttl/quota-forest/07-assert.yaml b/test/e2e-kuttl/quota-forest/07-assert.yaml
diff --git a/test/e2e-kuttl/quota-forest/07-install.yaml b/test/e2e-kuttl/quota-forest/07-install.yaml
diff --git a/test/e2e-kuttl/quota-forest/08-assert.yaml b/test/e2e-kuttl/quota-forest/08-assert.yaml
diff --git a/test/e2e-kuttl/quota-forest/08-install.yaml b/test/e2e-kuttl/quota-forest/08-install.yaml
