diff --git a/ci/jenkins/PR.groovy b/ci/jenkins/PR.groovy index c0a3b49f31..092b7361fb 100644 --- a/ci/jenkins/PR.groovy +++ b/ci/jenkins/PR.groovy @@ -17,9 +17,9 @@ pipeline { } agent { kubernetes { - inheritFrom 'default' + inheritFrom 'milvus-e2e' defaultContainer 'main' - yamlFile 'ci/jenkins/pod/rte.yaml' + yamlFile 'ci/jenkins/pod/rte-build.yaml' customWorkspace '/home/jenkins/agent/workspace' } } @@ -103,6 +103,7 @@ pipeline { // sh 'git config --global --add safe.directory /home/jenkins/agent/workspace' if ("${MILVUS_SERVER_TYPE}".contains("kafka")) { valuesFile = "pr_kafka.yaml" + } if ("${MILVUS_CLIENT}" == "pymilvus") { diff --git a/ci/jenkins/pod/e2e.yaml b/ci/jenkins/pod/e2e.yaml index 57b01a9ca4..faf7f18839 100644 --- a/ci/jenkins/pod/e2e.yaml +++ b/ci/jenkins/pod/e2e.yaml @@ -3,6 +3,7 @@ kind: Pod metadata: labels: app: milvus-e2e + task: milvus-e2e-pytest namespace: milvus-ci spec: enableServiceLinks: false diff --git a/ci/jenkins/pod/rte-build.yaml b/ci/jenkins/pod/rte-build.yaml new file mode 100644 index 0000000000..c2b0e31d1a --- /dev/null +++ b/ci/jenkins/pod/rte-build.yaml @@ -0,0 +1,68 @@ +apiVersion: v1 +kind: Pod +metadata: + labels: + app: milvus-e2e + task: milvus-e2e-build + namespace: milvus-ci +spec: + enableServiceLinks: false + containers: + - name: main + image: milvusdb/krte:20221214-66bf02d + env: + - name: DOCKER_IN_DOCKER_ENABLED + value: "true" + - name: DOCKER_VOLUME_DIRECTORY + value: "/mnt/disk/.docker" + - name: DOCKER_CLIENT_TIMEOUT + value: 240 + - name: COMPOSE_HTTP_TIMEOUT + value: 240 + tty: true + securityContext: + privileged: true + args: ["cat"] + resources: + limits: + cpu: "6" + memory: 12Gi + requests: + cpu: "0.5" + memory: 2Gi + volumeMounts: + - mountPath: /docker-graph + name: docker-graph + - mountPath: /var/lib/docker + name: docker-root + - mountPath: /lib/modules + name: modules + readOnly: true + - mountPath: /sys/fs/cgroup + name: cgroup + - mountPath: /mnt/disk/.docker + name: build-cache + subPath: docker-volume + - mountPath: /ci-logs + name: ci-logs + volumes: + - emptyDir: {} + name: docker-graph + - emptyDir: {} + name: docker-root + - hostPath: + path: /tmp/krte/cache + type: DirectoryOrCreate + name: build-cache + - hostPath: + path: /lib/modules + type: Directory + name: modules + - hostPath: + path: /sys/fs/cgroup + type: Directory + name: cgroup + - name: ci-logs + nfs: + path: /ci-logs + server: 172.16.70.239 diff --git a/tests/scripts/values/ci/pr.yaml b/tests/scripts/values/ci/pr.yaml index 851be0f995..8531c00c2a 100644 --- a/tests/scripts/values/ci/pr.yaml +++ b/tests/scripts/values/ci/pr.yaml @@ -2,70 +2,83 @@ metrics: serviceMonitor: enabled: true log: - level: debug + level: debug proxy: resources: requests: - cpu: "0.1" + cpu: "0.3" memory: "256Mi" - + limits: + cpu: "1" rootCoordinator: resources: requests: - cpu: "0.1" + cpu: "0.2" memory: "256Mi" - + limits: + cpu: "1" queryCoordinator: resources: requests: - cpu: "0.4" + cpu: "0.2" memory: "100Mi" - + limits: + cpu: "1" queryNode: resources: requests: cpu: "0.5" memory: "500Mi" + limits: + cpu: "2" indexCoordinator: resources: requests: cpu: "0.1" memory: "50Mi" + limits: + cpu: "1" indexNode: resources: requests: cpu: "0.5" memory: "500Mi" - + limits: + cpu: "2" dataCoordinator: resources: requests: cpu: "0.1" memory: "50Mi" - + limits: + cpu: "1" dataNode: resources: requests: cpu: "0.5" memory: "500Mi" + limits: + cpu: "2" pulsar: + components: + autorecovery: false proxy: configData: PULSAR_MEM: > - -Xms2048m -Xmx2048m + -Xms1024m -Xmx1024m PULSAR_GC: > -XX:MaxDirectMemorySize=2048m httpNumThreads: "50" resources: requests: cpu: "0.5" - memory: "2Gi" + memory: "1Gi" # Resources for the websocket proxy wsResources: requests: - memory: "512Mi" - cpu: "0.3" + memory: "100Mi" + cpu: "0.1" broker: resources: requests: @@ -121,18 +134,6 @@ pulsar: cpu: "0.5" memory: "4Gi" - bastion: - resources: - requests: - cpu: "0.3" - memory: "50Mi" - - autorecovery: - resources: - requests: - cpu: "0.5" - memory: "512Mi" - zookeeper: replicaCount: 1 configData: @@ -151,12 +152,23 @@ pulsar: resources: requests: cpu: "0.3" - memory: "1Gi" + memory: "512Mi" +kafka: + resources: + requests: + cpu: "0.5" + memory: "1Gi" + zookeeper: + replicaCount: 1 + resources: + requests: + cpu: "0.3" + memory: "512Mi" etcd: replicaCount: 1 resources: requests: - cpu: "0.1" + cpu: "0.3" memory: "100Mi" minio: resources: @@ -166,5 +178,7 @@ minio: standalone: resources: requests: - cpu: "0.5" + cpu: "1" memory: "3.5Gi" + limits: + cpu: "4" \ No newline at end of file