From fab09693b91a320614790f6a5518e9bb990aca3c Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Wed, 14 Aug 2019 11:39:43 +0000 Subject: [PATCH 1/7] Bump Docker to 19.03.1 for smoke tests --- DEPENDENCIES | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEPENDENCIES b/DEPENDENCIES index b045b8e1..7569c0d4 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -1,3 +1,3 @@ -DOCKER_VERSION=17.06 +DOCKER_VERSION=19.03.1 KUBERNETES_VERSION=1.11.0 KUBERNETES_CNI_VERSION=0.6.0 From 3d66dcd94ef5afc94396dbf4ec45ec70064f41de Mon Sep 17 00:00:00 2001 From: Murali Reddy Date: Thu, 30 Jan 2020 00:14:29 +0530 Subject: [PATCH 2/7] run terraform init for gcp plugin initialization --- test/run-integration-tests.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/run-integration-tests.sh b/test/run-integration-tests.sh index 188212aa..afad1261 100755 --- a/test/run-integration-tests.sh +++ b/test/run-integration-tests.sh @@ -156,7 +156,8 @@ function create_image() { greenly echo "> Creating GCP image $IMAGE_NAME..." local begin_img=$(date +%s) local num_hosts=1 - terraform apply -input=false -var "app=$APP" -var "name=$NAME" -var "num_hosts=$num_hosts" "$DIR/../tools/provisioning/gcp" + terraform init "$DIR/../tools/provisioning/gcp" + terraform apply -auto-approve -input=false -var "app=$APP" -var "name=$NAME" -var "num_hosts=$num_hosts" "$DIR/../tools/provisioning/gcp" configure_with_ansible "$(terraform output username)" "$(terraform output public_ips)," "$(terraform output private_key_path)" $num_hosts local zone=$(terraform output zone) local name=$(terraform output instances_names) From f24cf798bc05f98d1e9b1e76153b3caa9a4409aa Mon Sep 17 00:00:00 2001 From: Murali Reddy Date: Thu, 30 Jan 2020 06:47:08 +0530 Subject: [PATCH 3/7] build tool updates including changes to accommodate current get.docker.com script --- tools | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools b/tools index 2a2df527..7c2f120b 160000 --- a/tools +++ b/tools @@ -1 +1 @@ -Subproject commit 2a2df527894bcaa5d42ad80654c43e1e5a6b03d7 +Subproject commit 7c2f120b0ec320f362de51d3c46543e8d7c07cb9 From 0c4aeb3a0b216c2d116087ddef8e7a61a57fc747 Mon Sep 17 00:00:00 2001 From: Murali Reddy Date: Thu, 30 Jan 2020 12:15:23 +0530 Subject: [PATCH 4/7] Run smoke-tests with Kubernetes 1.14.0 and CNI 0.7.5 --- DEPENDENCIES | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DEPENDENCIES b/DEPENDENCIES index 7569c0d4..c9be7ace 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -1,3 +1,3 @@ DOCKER_VERSION=19.03.1 -KUBERNETES_VERSION=1.11.0 -KUBERNETES_CNI_VERSION=0.6.0 +KUBERNETES_VERSION=1.14.0 +KUBERNETES_CNI_VERSION=0.7.5 From ce9d05e0bdc2f9ad051a051fdd69b7ac8b605b86 Mon Sep 17 00:00:00 2001 From: Murali Reddy Date: Tue, 4 Feb 2020 08:47:57 +0530 Subject: [PATCH 5/7] Allow kubeadm to install on nodes with 1 CPU, for smoke tests --- test/840_weave_kube_3_test.sh | 2 +- test/860_weave_kube_portmap_3_test.sh | 2 +- test/870_weave_recovers_unreachable_ips_on_relaunch_3_test.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/840_weave_kube_3_test.sh b/test/840_weave_kube_3_test.sh index d67ab196..c490fdcf 100755 --- a/test/840_weave_kube_3_test.sh +++ b/test/840_weave_kube_3_test.sh @@ -37,7 +37,7 @@ k8s_version="$(run_on $HOST1 "kubelet --version" | grep -oP "(?<=Kubernetes )v[\ for host in $HOSTS; do if [ $host = $HOST1 ] ; then - run_on $host "sudo systemctl start kubelet && sudo kubeadm init --kubernetes-version=$k8s_version --token=$TOKEN --pod-network-cidr=$WEAVE_NETWORK" + run_on $host "sudo systemctl start kubelet && sudo kubeadm init --ignore-preflight-errors=NumCPU --kubernetes-version=$k8s_version --token=$TOKEN --pod-network-cidr=$WEAVE_NETWORK" else run_on $host "sudo systemctl start kubelet && sudo kubeadm join --token=$TOKEN --discovery-token-unsafe-skip-ca-verification $HOST1IP:$KUBE_PORT" fi diff --git a/test/860_weave_kube_portmap_3_test.sh b/test/860_weave_kube_portmap_3_test.sh index 1d936013..99d50d6d 100755 --- a/test/860_weave_kube_portmap_3_test.sh +++ b/test/860_weave_kube_portmap_3_test.sh @@ -41,7 +41,7 @@ function setup_kubernetes_cluster { for host in $HOSTS; do if [ $host = $HOST1 ] ; then - run_on $host "sudo systemctl start kubelet && sudo kubeadm init --kubernetes-version=$k8s_version --token=$TOKEN" + run_on $host "sudo systemctl start kubelet && sudo kubeadm init --ignore-preflight-errors=NumCPU --kubernetes-version=$k8s_version --token=$TOKEN" else run_on $host "sudo systemctl start kubelet && sudo kubeadm join --token=$TOKEN --discovery-token-unsafe-skip-ca-verification $HOST1IP:$KUBE_PORT" fi diff --git a/test/870_weave_recovers_unreachable_ips_on_relaunch_3_test.sh b/test/870_weave_recovers_unreachable_ips_on_relaunch_3_test.sh index ea967251..75afb97f 100755 --- a/test/870_weave_recovers_unreachable_ips_on_relaunch_3_test.sh +++ b/test/870_weave_recovers_unreachable_ips_on_relaunch_3_test.sh @@ -41,7 +41,7 @@ function setup_kubernetes_cluster { for host in $HOSTS; do if [ $host = $HOST1 ] ; then - run_on $host "sudo systemctl start kubelet && sudo kubeadm init --kubernetes-version=$k8s_version --token=$TOKEN" + run_on $host "sudo systemctl start kubelet && sudo kubeadm init --ignore-preflight-errors=NumCPU --kubernetes-version=$k8s_version --token=$TOKEN" else run_on $host "sudo systemctl start kubelet && sudo kubeadm join --token=$TOKEN --discovery-token-unsafe-skip-ca-verification $HOST1IP:$KUBE_PORT" fi From aa9caab1b0e07b6f977fa428c472ba753cfecb6c Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Fri, 31 Jul 2020 14:10:30 +0000 Subject: [PATCH 6/7] Fix incompatibility in Docker Python test Using code from https://github.com/bboreham/docker-py/tree/v1.9.0-prime Also change to using Python 3 since 2.x is EOL. --- test/600_proxy_docker_py.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/600_proxy_docker_py.sh b/test/600_proxy_docker_py.sh index 1f69d8b1..c3c152d2 100755 --- a/test/600_proxy_docker_py.sh +++ b/test/600_proxy_docker_py.sh @@ -3,7 +3,7 @@ . "$(dirname "$0")/config.sh" -IMAGE="weaveworks/docker-py:1.9.0-prime" +IMAGE="weaveworks/docker-py3:1.9.0-prime" docker_py_test() { SHARD=$1 From c50b3380eaa5c667802e64fd81176472f93b55a0 Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Fri, 31 Jul 2020 14:12:04 +0000 Subject: [PATCH 7/7] Fix tests where newer Docker returns hex ID of container as network ID --- test/666_abuse_of_start_test.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/test/666_abuse_of_start_test.sh b/test/666_abuse_of_start_test.sh index 79f3551d..c932a434 100755 --- a/test/666_abuse_of_start_test.sh +++ b/test/666_abuse_of_start_test.sh @@ -6,7 +6,7 @@ start_suite "Abuse of 'start' operation" weave_on $HOST1 launch docker_bridge_ip=$(weave_on $HOST1 docker-bridge-ip) -proxy_start_container $HOST1 --name=c1 +id1=$(proxy_start_container $HOST1 --name=c1) check_hostconfig() { docker_on $HOST1 attach $1 >/dev/null 2>&1 || true # Wait for container to exit @@ -16,12 +16,12 @@ check_hostconfig() { # Start c2 with a sneaky HostConfig proxy docker_on $HOST1 create --name=c2 $SMALL_IMAGE $CHECK_ETHWE_UP proxy docker_api_on $HOST1 POST /containers/c2/start '{"NetworkMode": "container:c1"}' -check_hostconfig c2 container:c1 +check_hostconfig c2 "container:$id1" # Start c5 with a differently sneaky HostConfig proxy docker_on $HOST1 create --name=c5 $SMALL_IMAGE $CHECK_ETHWE_UP proxy docker_api_on $HOST1 POST /containers/c5/start '{"HostConfig": {"NetworkMode": "container:c1"}}' -check_hostconfig c5 container:c1 +check_hostconfig c5 "container:$id1" # Start c3 with HostConfig having empty binds and null dns/networking settings proxy docker_on $HOST1 create --name=c3 -v /tmp:/hosttmp $SMALL_IMAGE $CHECK_ETHWE_UP @@ -41,7 +41,7 @@ assert "docker_on $HOST1 inspect -f '{{.HostConfig.MemorySwap}}' c4b" "-1" # Start c6 with both named and unnamed HostConfig proxy docker_on $HOST1 create --name=c6 $SMALL_IMAGE $CHECK_ETHWE_UP proxy docker_api_on $HOST1 POST /containers/c6/start '{"NetworkMode": "container:c2", "HostConfig": {"NetworkMode": "container:c1"}}' -check_hostconfig c6 container:c1 +check_hostconfig c6 "container:$id1" # Start c7 with an empty HostConfig and check this removes previous parameters, but still attaches to weave proxy docker_on $HOST1 create --name=c7 --memory-swap -1 $SMALL_IMAGE $CHECK_ETHWE_UP @@ -55,9 +55,9 @@ proxy docker_api_on $HOST1 POST /containers/c8/start '{"HostConfig": {"NetworkMo check_hostconfig c8 host # Start c10 in network of host container -proxy_start_container $HOST1 --name=c9 --net=host +id9=$(proxy_start_container $HOST1 --name=c9 --net=host) proxy docker_on $HOST1 create --name=c10 $SMALL_IMAGE $CHECK_ETHWE_MISSING proxy docker_api_on $HOST1 POST /containers/c10/start '{"HostConfig": {"NetworkMode": "container:c9"}}' -check_hostconfig c10 container:c9 +check_hostconfig c10 "container:$id9" end_suite