WIP: trigger e2e on arm

Signed-off-by: Mikhail Sakhnov <[email protected]>
neondatabase · Dec 10, 2024 · d387d1d · d387d1d
1 parent f85f8e6
commit d387d1d
Show file tree

Hide file tree

Showing 55 changed files with 401 additions and 251 deletions.
diff --git a/.github/workflows/e2e-test.yaml b/.github/workflows/e2e-test.yaml
@@ -233,8 +233,8 @@ jobs:
           docker image tag "$TEST_IMAGE" "$IMG_E2E_TEST"
           make load-example-vms
 
-      - run: make e2e
-        timeout-minutes: 15
+      - run: make arm_patch_e2e e2e
+        timeout-minutes: 30
 
       - name: Get k8s logs and events
         if: always()

diff --git a/tests/e2e/autoscaling.cpu-sys-fs-state-scaling/00-assert.yaml b/tests/e2e/autoscaling.cpu-sys-fs-state-scaling/00-assert.yaml
@@ -15,3 +15,7 @@ status:
   cpus: 250m
   memorySize: 1Gi
   memoryProvider: VirtioMem
+spec:
+  cpuScalingMode: sysfsScaling
+  guest:
+    memoryProvider: VirtioMem
diff --git a/tests/e2e/autoscaling.cpu-sys-fs-state-scaling/00-create-vm.yaml b/tests/e2e/autoscaling.cpu-sys-fs-state-scaling/00-create-vm.yaml
@@ -8,10 +8,10 @@ metadata:
   name: example
 spec:
   ports:
-  - name: postgres
-    port: 5432
-    protocol: TCP
-    targetPort: postgres
+    - name: postgres
+      port: 5432
+      protocol: TCP
+      targetPort: postgres
   type: NodePort
   selector:
     vm.neon.tech/name: example
@@ -56,7 +56,7 @@ spec:
       - name: monitor
         port: 10301
   extraNetwork:
-      enable: false
+    enable: false
   disks:
     - name: pgdata
       mountPath: /var/lib/postgresql
@@ -73,7 +73,8 @@ spec:
       mountPath: /neonvm/cache
       tmpfs:
         size: 1Gi
-
+status:
+  memoryProvider: VirtioMem
 ---
 apiVersion: v1
 kind: ConfigMap

diff --git a/tests/e2e/autoscaling.cpu-sys-fs-state-scaling/01-assert.yaml b/tests/e2e/autoscaling.cpu-sys-fs-state-scaling/01-assert.yaml
@@ -14,6 +14,11 @@ status:
       status: "True"
   cpus: 3
   memorySize: 4Gi
+  memoryProvider: VirtioMem
+spec:
+  cpuScalingMode: sysfsScaling
+  guest:
+    memoryProvider: VirtioMem
 ---
 apiVersion: v1
 kind: pod

diff --git a/tests/e2e/autoscaling.cpu-sys-fs-state-scaling/01-upscale.yaml b/tests/e2e/autoscaling.cpu-sys-fs-state-scaling/01-upscale.yaml
@@ -9,35 +9,35 @@ metadata:
 spec:
   terminationGracePeriodSeconds: 1
   initContainers:
-  - name: wait-for-pg
-    image: postgres:15-bullseye
-    command:
-    - sh
-    - "-c"
-    - |
-      set -e
-      until pg_isready --username=postgres --dbname=postgres --host=example --port=5432; do
-        sleep 1
-      done
+    - name: wait-for-pg
+      image: postgres:15-bullseye
+      command:
+        - sh
+        - "-c"
+        - |
+          set -e
+          until pg_isready --username=postgres --dbname=postgres --host=example --port=5432; do
+            sleep 1
+          done
   containers:
-  - name: pgbench
-    image: postgres:15-bullseye
-    volumeMounts:
-    - name: my-volume
-      mountPath: /etc/misc
-    command:
-    - pgbench
-    args:
-    - postgres://postgres@example:5432/postgres
-    - --client=20
-    - --progress=1
-    - --progress-timestamp
-    - --time=600
-    - --file=/etc/misc/query.sql
+    - name: pgbench
+      image: postgres:15-bullseye
+      volumeMounts:
+        - name: my-volume
+          mountPath: /etc/misc
+      command:
+        - pgbench
+      args:
+        - postgres://postgres@example:5432/postgres
+        - --client=20
+        - --progress=1
+        - --progress-timestamp
+        - --time=600
+        - --file=/etc/misc/query.sql
   volumes:
-  - name: my-volume
-    configMap:
-      name: query
+    - name: my-volume
+      configMap:
+        name: query
   restartPolicy: Never
 ---
 apiVersion: v1

diff --git a/tests/e2e/autoscaling.cpu-sys-fs-state-scaling/02-assert.yaml b/tests/e2e/autoscaling.cpu-sys-fs-state-scaling/02-assert.yaml
@@ -14,3 +14,8 @@ status:
       status: "True"
   cpus: 250m
   memorySize: 1Gi
+  memoryProvider: VirtioMem
+spec:
+  cpuScalingMode: sysfsScaling
+  guest:
+    memoryProvider: VirtioMem
diff --git a/tests/e2e/autoscaling.cpu-sys-fs-state-scaling/02-downscale.yaml b/tests/e2e/autoscaling.cpu-sys-fs-state-scaling/02-downscale.yaml
@@ -1,7 +1,7 @@
 apiVersion: kuttl.dev/v1beta1
 kind: TestStep
 delete:
-- apiVersion: v1
-  kind: Pod
-  name: workload
+  - apiVersion: v1
+    kind: Pod
+    name: workload
 unitTest: false
diff --git a/tests/e2e/autoscaling.dimmslots/00-assert.yaml b/tests/e2e/autoscaling.dimmslots/00-assert.yaml
@@ -14,4 +14,8 @@ status:
       status: "True"
   cpus: 250m
   memorySize: 1Gi
-  memoryProvider: DIMMSlots
+  memoryProvider: VirtioMem
+spec:
+  cpuScalingMode: sysfsScaling
+  guest:
+    memoryProvider: VirtioMem
diff --git a/tests/e2e/autoscaling.dimmslots/00-create-vm.yaml b/tests/e2e/autoscaling.dimmslots/00-create-vm.yaml
@@ -8,10 +8,10 @@ metadata:
   name: example
 spec:
   ports:
-  - name: postgres
-    port: 5432
-    protocol: TCP
-    targetPort: postgres
+    - name: postgres
+      port: 5432
+      protocol: TCP
+      targetPort: postgres
   type: NodePort
   selector:
     vm.neon.tech/name: example
@@ -36,7 +36,7 @@ spec:
       min: 1
       max: 5
       use: 1
-    memoryProvider: DIMMSlots
+    memoryProvider: VirtioMem
     rootDisk:
       image: vm-postgres:15-bullseye
       size: 8Gi
@@ -55,7 +55,7 @@ spec:
       - name: monitor
         port: 10301
   extraNetwork:
-      enable: true
+    enable: true
   disks:
     - name: pgdata
       mountPath: /var/lib/postgresql
@@ -72,7 +72,9 @@ spec:
       mountPath: /neonvm/cache
       tmpfs:
         size: 1Gi
-
+  cpuScalingMode: sysfsScaling
+status:
+  memoryProvider: VirtioMem
 ---
 apiVersion: v1
 kind: ConfigMap

diff --git a/tests/e2e/autoscaling.dimmslots/01-assert.yaml b/tests/e2e/autoscaling.dimmslots/01-assert.yaml
@@ -14,6 +14,11 @@ status:
       status: "True"
   cpus: 1
   memorySize: 4Gi
+  memoryProvider: VirtioMem
+spec:
+  cpuScalingMode: sysfsScaling
+  guest:
+    memoryProvider: VirtioMem
 ---
 apiVersion: v1
 kind: pod

diff --git a/tests/e2e/autoscaling.dimmslots/01-upscale.yaml b/tests/e2e/autoscaling.dimmslots/01-upscale.yaml
@@ -9,35 +9,35 @@ metadata:
 spec:
   terminationGracePeriodSeconds: 1
   initContainers:
-  - name: wait-for-pg
-    image: postgres:15-bullseye
-    command:
-    - sh
-    - "-c"
-    - |
-      set -e
-      until pg_isready --username=postgres --dbname=postgres --host=example --port=5432; do
-        sleep 1
-      done
+    - name: wait-for-pg
+      image: postgres:15-bullseye
+      command:
+        - sh
+        - "-c"
+        - |
+          set -e
+          until pg_isready --username=postgres --dbname=postgres --host=example --port=5432; do
+            sleep 1
+          done
   containers:
-  - name: pgbench
-    image: postgres:15-bullseye
-    volumeMounts:
-    - name: my-volume
-      mountPath: /etc/misc
-    command:
-    - pgbench
-    args:
-    - postgres://postgres@example:5432/postgres
-    - --client=20
-    - --progress=1
-    - --progress-timestamp
-    - --time=600
-    - --file=/etc/misc/query.sql
+    - name: pgbench
+      image: postgres:15-bullseye
+      volumeMounts:
+        - name: my-volume
+          mountPath: /etc/misc
+      command:
+        - pgbench
+      args:
+        - postgres://postgres@example:5432/postgres
+        - --client=20
+        - --progress=1
+        - --progress-timestamp
+        - --time=600
+        - --file=/etc/misc/query.sql
   volumes:
-  - name: my-volume
-    configMap:
-      name: query
+    - name: my-volume
+      configMap:
+        name: query
   restartPolicy: Never
 ---
 apiVersion: v1

diff --git a/tests/e2e/autoscaling.dimmslots/02-assert.yaml b/tests/e2e/autoscaling.dimmslots/02-assert.yaml
@@ -14,3 +14,8 @@ status:
       status: "True"
   cpus: 250m
   memorySize: 1Gi
+  memoryProvider: VirtioMem
+spec:
+  cpuScalingMode: sysfsScaling
+  guest:
+    memoryProvider: VirtioMem
diff --git a/tests/e2e/autoscaling.dimmslots/02-downscale.yaml b/tests/e2e/autoscaling.dimmslots/02-downscale.yaml
@@ -1,7 +1,7 @@
 apiVersion: kuttl.dev/v1beta1
 kind: TestStep
 delete:
-- apiVersion: v1
-  kind: Pod
-  name: workload
+  - apiVersion: v1
+    kind: Pod
+    name: workload
 unitTest: false
diff --git a/tests/e2e/autoscaling.revisions/00-assert.yaml b/tests/e2e/autoscaling.revisions/00-assert.yaml
@@ -19,3 +19,7 @@ status:
     revision:
       value: 123
       flags: 456
+spec:
+  cpuScalingMode: sysfsScaling
+  guest:
+    memoryProvider: VirtioMem
diff --git a/tests/e2e/autoscaling.revisions/00-create-vm.yaml b/tests/e2e/autoscaling.revisions/00-create-vm.yaml
@@ -8,10 +8,10 @@ metadata:
   name: example
 spec:
   ports:
-  - name: postgres
-    port: 5432
-    protocol: TCP
-    targetPort: postgres
+    - name: postgres
+      port: 5432
+      protocol: TCP
+      targetPort: postgres
   type: NodePort
   selector:
     vm.neon.tech/name: example
@@ -58,8 +58,9 @@ spec:
         port: 9100
       - name: monitor
         port: 10301
+    memoryProvider: VirtioMem
   extraNetwork:
-      enable: true
+    enable: true
   disks:
     - name: pgdata
       mountPath: /var/lib/postgresql
@@ -76,7 +77,9 @@ spec:
       mountPath: /neonvm/cache
       tmpfs:
         size: 1Gi
-
+  cpuScalingMode: sysfsScaling
+status:
+  memoryProvider: VirtioMem
 ---
 apiVersion: v1
 kind: ConfigMap

diff --git a/tests/e2e/autoscaling.revisions/01-assert.yaml b/tests/e2e/autoscaling.revisions/01-assert.yaml
@@ -11,3 +11,8 @@ status:
     revision:
       value: 1
       flags: 123
+  memoryProvider: VirtioMem
+spec:
+  cpuScalingMode: sysfsScaling
+  guest:
+    memoryProvider: VirtioMem
diff --git a/tests/e2e/autoscaling.revisions/01-change-target-revision.yaml b/tests/e2e/autoscaling.revisions/01-change-target-revision.yaml
@@ -2,7 +2,6 @@ apiVersion: kuttl.dev/v1beta1
 kind: TestStep
 unitTest: false
 ---
-
 apiVersion: vm.neon.tech/v1
 kind: VirtualMachine
 metadata:
@@ -15,3 +14,8 @@ spec:
       value: 1
       flags: 123
     updatedAt: 2020-01-02T15:04:05Z
+  cpuScalingMode: sysfsScaling
+  guest:
+    memoryProvider: VirtioMem
+status:
+  memoryProvider: VirtioMem
diff --git a/tests/e2e/autoscaling.revisions/02-assert.yaml b/tests/e2e/autoscaling.revisions/02-assert.yaml
@@ -11,6 +11,9 @@ spec:
     revision:
       value: 124 # we had 123 as the initial revision
       flags: 1 # 1 for Upscale
+  cpuScalingMode: sysfsScaling
+  guest:
+    memoryProvider: VirtioMem
 status:
   phase: Running
   restartCount: 0
@@ -23,6 +26,7 @@ status:
     revision:
       value: 124
       flags: 1
+  memoryProvider: VirtioMem
 ---
 apiVersion: v1
 kind: pod