diff --git a/ci/jenkins/PR.groovy b/ci/jenkins/PR.groovy index 25bc6b13ab..f28f2f7f48 100644 --- a/ci/jenkins/PR.groovy +++ b/ci/jenkins/PR.groovy @@ -219,6 +219,7 @@ pipeline { } } } + } } } @@ -240,6 +241,7 @@ pipeline { } } } + } } diff --git a/ci/jenkins/pod/e2e.yaml b/ci/jenkins/pod/e2e.yaml index 0999814e9d..1f05879093 100644 --- a/ci/jenkins/pod/e2e.yaml +++ b/ci/jenkins/pod/e2e.yaml @@ -20,7 +20,60 @@ spec: volumeMounts: - mountPath: /ci-logs name: ci-logs + - name: main + image: milvusdb/krte:20211213-dcc15e9 + 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: /volume1/ci-logs diff --git a/tests/scripts/ci_logs.sh b/tests/scripts/ci_logs.sh index a2e2a728a7..af03bcc223 100755 --- a/tests/scripts/ci_logs.sh +++ b/tests/scripts/ci_logs.sh @@ -94,7 +94,7 @@ else for log_file in ${log_files} do file_name=$(basename ${log_file}) - mv ${log_file} ${RELEASE_LOG_DIR}/`echo ${file_name} | sed 's/jenkins.var.log.containers.//g' ` + mv ${log_file} ${RELEASE_LOG_DIR}/`echo ${file_name} | sed 's/ci.var.log.containers.//g' ` done tar -zcvf ${ARTIFACTS_NAME:-artifacts}.tar.gz ${RELEASE_LOG_DIR}/*