fix tests after Clustering tools refactoring

percona · Apr 5, 2019 · 3da5ee8 · 3da5ee8
1 parent 0c39ac9
commit 3da5ee8
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/e2e-tests/arbiter/run b/e2e-tests/arbiter/run
@@ -44,6 +44,7 @@ check_cr_config() {
     desc 'kill Primary Pod, check reelection, check data'
     initial_primary=$(get_mongo_primary "clusterAdmin:clusterAdmin123456@$URI")
     kubectl delete pods $initial_primary
+    sleep 10
     changed_primary=$(get_mongo_primary "clusterAdmin:clusterAdmin123456@$URI")
     [ "$initial_primary" != "$changed_primary" ]
     wait_for_running $cluster 2

diff --git a/e2e-tests/build b/e2e-tests/build
@@ -24,9 +24,6 @@ build_operator() {
         export GIT_COMMIT='$GIT_COMMIT'
         export GIT_BRANCH='$GIT_BRANCH'
 
-        cd /go/src/${repo}/vendor/github.com/percona/mongodb-orchestration-tools
-        make clean
-
         cd /go/src/${repo}
         mkdir -p build/_output/bin
         GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build \
@@ -76,6 +73,6 @@ until docker ps;
     do sleep 1;
 done
 build_operator
-build_tools
-build_mongod40
-build_mongod36
+#build_tools
+#build_mongod40
+#build_mongod36
diff --git a/e2e-tests/functions b/e2e-tests/functions
@@ -3,8 +3,8 @@
 GIT_COMMIT=$(git rev-parse HEAD)
 GIT_BRANCH=${VERSION:-$(git rev-parse --abbrev-ref HEAD | sed -e 's^/^-^g; s^[.]^-^g;' | tr '[:upper:]' '[:lower:]')}
 IMAGE=${IMAGE:-"perconalab/percona-server-mongodb-operator:${GIT_BRANCH}"}
-IMAGE_MONGOD36=${IMAGE_MONGOD36:-"perconalab/percona-server-mongodb-operator:${GIT_BRANCH}-mongod3.6"}
-IMAGE_MONGOD40=${IMAGE_MONGOD40:-"perconalab/percona-server-mongodb-operator:${GIT_BRANCH}-mongod4.0"}
+IMAGE_MONGOD36=${IMAGE_MONGOD36:-"percona/percona-server-mongodb-operator:0.3.0-mongod3.6.10"}
+IMAGE_MONGOD40=${IMAGE_MONGOD40:-"percona/percona-server-mongodb-operator:0.3.0-mongod4.0.6"}
 IMAGE_MONGOD=$IMAGE_MONGOD40
 tmp_dir=$(mktemp -d)
 sed=$(which gsed || which sed)

diff --git a/e2e-tests/service-per-pod/compare/service_cluster-ip-rs0-0.yml b/e2e-tests/service-per-pod/compare/service_cluster-ip-rs0-0.yml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
+    app.kubernetes.io/component: external-service
     app.kubernetes.io/instance: cluster-ip
     app.kubernetes.io/managed-by: percona-server-mongodb-operator
     app.kubernetes.io/name: percona-server-mongodb

diff --git a/e2e-tests/service-per-pod/compare/service_local-balancer-rs0-0.yml b/e2e-tests/service-per-pod/compare/service_local-balancer-rs0-0.yml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
+    app.kubernetes.io/component: external-service
     app.kubernetes.io/instance: local-balancer
     app.kubernetes.io/managed-by: percona-server-mongodb-operator
     app.kubernetes.io/name: percona-server-mongodb

diff --git a/e2e-tests/service-per-pod/run b/e2e-tests/service-per-pod/run
@@ -20,7 +20,7 @@ check_cr_config() {
     compare_kubectl service/$cluster-0
 
     local URI="$(get_service_ip $cluster-0),$(get_service_ip $cluster-1),$(get_service_ip $cluster-2)"
-    sleep 90
+    sleep 120
 
     # check read and write
     run_mongo \