From 39ebc4038873d6bd7de596dcdb7447d1a1f4d984 Mon Sep 17 00:00:00 2001
From: Denise Schannon <denise@rancher.com>
Date: Wed, 13 May 2020 07:57:38 -0700
Subject: [PATCH 1/3] lb-service-proxy:v0.9.14

---
 resources/content/cattle-global.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/content/cattle-global.properties b/resources/content/cattle-global.properties
index 2b1b52b5b7..5939d3a52b 100644
--- a/resources/content/cattle-global.properties
+++ b/resources/content/cattle-global.properties
@@ -5,7 +5,7 @@
 api.ui.index=//releases.rancher.com/ui/stable
 api.ui.js.url=https://releases.rancher.com/api-ui/1.0.4/ui.min.js
 api.ui.css.url=https://releases.rancher.com/api-ui/1.0.4/ui.min.css
-lb.instance.image=rancher/lb-service-haproxy:v0.9.1
+lb.instance.image=rancher/lb-service-haproxy:v0.9.14
 bootstrap.required.image=rancher/agent:v1.2.10
 bootstrap.required.windows.image=rancher/agent-windows:v0.2.0
 agent.package.python.agent.url=https://github.com/rancher/agent/releases/download/v0.13.8/go-agent.tar.gz

From 67df592772c5f9c6fa944f49a264255a3e283621 Mon Sep 17 00:00:00 2001
From: Daishan <daishan@rancher.com>
Date: Wed, 13 May 2020 09:43:14 -0700
Subject: [PATCH 2/3] Update requirement.txt

---
 tests/integration-v1/requirements.txt | 1 +
 tests/integration/requirements.txt    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/integration-v1/requirements.txt b/tests/integration-v1/requirements.txt
index c0752e9cd1..42ae1e5efc 100644
--- a/tests/integration-v1/requirements.txt
+++ b/tests/integration-v1/requirements.txt
@@ -5,6 +5,7 @@ PyJWT==1.4.0
 
 flake8==2.5.1
 pytest==3.0.2
+pytest-repeat==0.7.0
 pytest-xdist==v1.14
 pyyaml
 netaddr
diff --git a/tests/integration/requirements.txt b/tests/integration/requirements.txt
index 0a41337d8c..42ae1e5efc 100644
--- a/tests/integration/requirements.txt
+++ b/tests/integration/requirements.txt
@@ -5,7 +5,7 @@ PyJWT==1.4.0
 
 flake8==2.5.1
 pytest==3.0.2
-pytest-repeat
+pytest-repeat==0.7.0
 pytest-xdist==v1.14
 pyyaml
 netaddr

From 9ede955b6fdea5fb8722c5355376d2ca080c5e77 Mon Sep 17 00:00:00 2001
From: Daishan <daishan@rancher.com>
Date: Wed, 13 May 2020 15:12:27 -0700
Subject: [PATCH 3/3] Disable legacy test

---
 tests/integration-v1/cattletest/core/test_docker.py | 2 +-
 tests/integration/cattletest/core/test_docker.py    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/integration-v1/cattletest/core/test_docker.py b/tests/integration-v1/cattletest/core/test_docker.py
index ee3b2daa41..3fc7009c31 100644
--- a/tests/integration-v1/cattletest/core/test_docker.py
+++ b/tests/integration-v1/cattletest/core/test_docker.py
@@ -935,7 +935,7 @@ def test_service_links_with_no_ports(docker_client):
     assert service.state == 'active'
 
 
-@if_docker
+@pytest.mark.skipif('True')
 def test_blkio_device_options(super_client, docker_client):
     dev_opts = {
         '/dev/sda': {
diff --git a/tests/integration/cattletest/core/test_docker.py b/tests/integration/cattletest/core/test_docker.py
index 9f35392c16..75bd2da2da 100644
--- a/tests/integration/cattletest/core/test_docker.py
+++ b/tests/integration/cattletest/core/test_docker.py
@@ -1096,7 +1096,7 @@ def test_service_links_with_no_ports(docker_client):
     assert service.state == 'active'
 
 
-@if_docker
+@pytest.mark.skipif('True')
 def test_blkio_device_options(super_client, docker_client):
     dev_opts = {
         '/dev/sda': {