diff --git a/build/ci/jenkins/Jenkinsfile b/build/ci/jenkins/Jenkinsfile index 6fbc796fef..67c812b292 100644 --- a/build/ci/jenkins/Jenkinsfile +++ b/build/ci/jenkins/Jenkinsfile @@ -60,6 +60,7 @@ pipeline { ./e2e-k8s.sh \ --node-image registry.zilliz.com/kindest/node:v1.20.2 \ --kind-config "${env.WORKSPACE}/build/config/topology/trustworthy-jwt-ci.yaml" \ + --install-extra-arg "--set etcd.enabled=false --set externalEtcd.enabled=true --set externalEtcd.endpoints={\$KRTE_POD_IP:2379}" \ --skip-export-logs \ --skip-cleanup \ --test-extra-arg "--tags=smoke" \ @@ -73,6 +74,7 @@ pipeline { --skip-export-logs \ --skip-cleanup \ --kind-config "${env.WORKSPACE}/build/config/topology/trustworthy-jwt-ci.yaml" \ + --install-extra-arg "--set etcd.enabled=false --set externalEtcd.enabled=true --set externalEtcd.endpoints={\$KRTE_POD_IP:2379}" \ --test-extra-arg "--tags L0 L1" \ --test-timeout ${e2e_timeout_seconds} """ diff --git a/build/ci/jenkins/NightlyCI.groovy b/build/ci/jenkins/NightlyCI.groovy index 9293b5b7bf..3cb7c1e80b 100644 --- a/build/ci/jenkins/NightlyCI.groovy +++ b/build/ci/jenkins/NightlyCI.groovy @@ -68,6 +68,7 @@ pipeline { ./e2e-k8s.sh \ --kind-config "${env.WORKSPACE}/build/config/topology/trustworthy-jwt-ci.yaml" \ --node-image registry.zilliz.com/kindest/node:v1.20.2 \ + --install-extra-arg "--set etcd.enabled=false --set externalEtcd.enabled=true --set externalEtcd.endpoints={\$KRTE_POD_IP:2379}" \ --skip-export-logs \ --skip-cleanup \ --test-timeout ${e2e_timeout_seconds} @@ -78,6 +79,7 @@ pipeline { ./e2e-k8s.sh \ --kind-config "${env.WORKSPACE}/build/config/topology/trustworthy-jwt-ci.yaml" \ --node-image registry.zilliz.com/kindest/node:v1.20.2 \ + --install-extra-arg "--set etcd.enabled=false --set externalEtcd.enabled=true --set externalEtcd.endpoints={\$KRTE_POD_IP:2379}" \ --skip-export-logs \ --skip-cleanup \ --test-extra-arg "--tags L0 L1 L2" \ diff --git a/build/ci/jenkins/pod/krte.yaml b/build/ci/jenkins/pod/krte.yaml index 2c905df02f..f9b3fdd2b8 100644 --- a/build/ci/jenkins/pod/krte.yaml +++ b/build/ci/jenkins/pod/krte.yaml @@ -12,6 +12,10 @@ spec: value: "true" - name: DOCKER_VOLUME_DIRECTORY value: "/mnt/disk/.docker" + - name: KRTE_POD_IP + valueFrom: + fieldRef: + fieldPath: status.podIP securityContext: privileged: true tty: true @@ -38,6 +42,20 @@ spec: - mountPath: /mnt/disk/.docker name: build-cache subPath: docker-volume + - name: etcd + image: quay.io/coreos/etcd:v3.4.13 + command: + - etcd + - -advertise-client-urls=http://127.0.0.1:2379 + - -listen-client-urls=http://0.0.0.0:2379 + resources: + limits: + cpu: "1" + memory: "1Gi" + ports: + - containerPort: 2379 + name: client + protocol: TCP volumes: - emptyDir: {} name: docker-graph