commit d82e52334b4c87f67dde3a543bc1fc5881b33f5d
author Tatyanka Leontovich <tleontovich@mirantis.com> Fri Jan 11 12:18:32 2019 +0000
committer Gerrit Code Review <support@gerrithub.io> Fri Jan 11 12:18:32 2019 +0000
tree ec7cabd7a1850115ac93f3644dc9438c057d0fa4
parent df81e976ec4a3d57e87b75bedc7700bfa349d4f1
parent 2a4987321b36d9b3d9da7deb29dba9ac7396fc6d

Merge "Add tests to run cvp-func and cvp-sanity jobs"

tcp_tests/managers/underlay_ssh_manager.py

diff --git a/tcp_tests/managers/underlay_ssh_manager.py b/tcp_tests/managers/underlay_ssh_manager.py
index 5edebc7..cf1fb2b 100644
--- a/tcp_tests/managers/underlay_ssh_manager.py
+++ b/tcp_tests/managers/underlay_ssh_manager.py
@@ -509,11 +509,6 @@
             for minion in minions:
                 LOG.info("Getting archived artifacts from the minion {0}"
                          .format(minion))
-                master.check_call(
-                    "salt {minion} pkg.install rsync".format(
-                        minion=minion.strip()),
-                    raise_on_err=False,
-                    timeout=120)
                 master.check_call("rsync -aruv {0}:/root/*.tar.gz "
                                   "/root/dump/".format(minion.strip()),
                                   raise_on_err=False,

tcp_tests/settings_oslo.py

diff --git a/tcp_tests/settings_oslo.py b/tcp_tests/settings_oslo.py
index a689b07..4b1f14a 100644
--- a/tcp_tests/settings_oslo.py
+++ b/tcp_tests/settings_oslo.py
@@ -335,17 +335,41 @@
            default='{}/mirantis/kubernetes/pause-amd64:v1.12.3-2'.format(
                settings.DOCKER_REGISTRY)),
     ct.Cfg('kubernetes_calico_image', ct.String(),
-           default='{}/mirantis/projectcalico/calico/node:v3.1.3'.format(
+           default='{}/mirantis/projectcalico/calico/node:v3.3.2'.format(
                settings.DOCKER_REGISTRY)),
     ct.Cfg('kubernetes_calico_calicoctl_image', ct.String(),
-           default='{}/mirantis/projectcalico/calico/ctl:v3.1.3'.format(
+           default='{}/mirantis/projectcalico/calico/ctl:v3.3.2'.format(
                settings.DOCKER_REGISTRY)),
     ct.Cfg('kubernetes_calico_cni_image', ct.String(),
-           default='{}/mirantis/projectcalico/calico/cni:v3.1.3'.format(
+           default='{}/mirantis/projectcalico/calico/cni:v3.3.2'.format(
                settings.DOCKER_REGISTRY)),
     ct.Cfg('kubernetes_calico_kube_controllers_image', ct.String(),
            default='{}/mirantis/projectcalico/calico/kube-controllers:'
-                   'v3.1.3'.format(settings.DOCKER_REGISTRY)),
+                   'v3.3.2'.format(settings.DOCKER_REGISTRY)),
+    ct.Cfg('kubernetes_calico_calicoctl_source', ct.String(),
+           default='{}/mirantis/projectcalico/calicoctl/'
+                   'calicoctl-v3.3.2'.format(
+               settings.BINARY_REGISTRY)),
+    ct.Cfg('kubernetes_calico_calicoctl_source_hash', ct.String(),
+           default='md5=bb38517fdd6b8bb7c130ae7550a9d335'),
+    ct.Cfg('kubernetes_calico_birdcl_source', ct.String(),
+           default='{}/mirantis/projectcalico/bird/'
+                   'birdcl-v0.3.3'.format(
+               settings.BINARY_REGISTRY)),
+    ct.Cfg('kubernetes_calico_birdcl_source_hash', ct.String(),
+           default='md5=0327442efd2592ddce449b66c5d0fc9d'),
+    ct.Cfg('kubernetes_calico_cni_source', ct.String(),
+           default='{}/mirantis/projectcalico/cni-plugin/'
+                   'calico-v3.3.2'.format(
+               settings.BINARY_REGISTRY)),
+    ct.Cfg('kubernetes_calico_cni_source_hash', ct.String(),
+           default='md5=2544bc1865c1451cac7a61264c25a2cb'),
+    ct.Cfg('kubernetes_calico_cni_ipam_source', ct.String(),
+           default='{}/mirantis/projectcalico/cni-plugin/'
+                   'calico-ipam-v3.3.2'.format(
+               settings.BINARY_REGISTRY)),
+    ct.Cfg('kubernetes_calico_cni_ipam_source_hash', ct.String(),
+           default='md5=b22623eeea3b29ba8ec071d859ac7055'),
     ct.Cfg('kubernetes_netchecker_enabled', ct.Boolean(),
            help="", default=True),
     ct.Cfg('kubernetes_netchecker_agent_image', ct.String(),