aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Gelety <jgelety@cisco.com>2018-04-11 16:48:06 +0200
committerJan Gelety <jgelety@cisco.com>2018-04-12 07:35:52 +0000
commit39ce5d87070867c5a906e2a2ed8a683f975289f4 (patch)
tree8109b0b7974d1582e8deb7a438fc8afc7e5b9b69
parent407f39f8b6a798575975db98265f5318285fb4d1 (diff)
Set correct paths to vpp stable/1804 and use vpp stable/1804 builds
- two IPSEC-LISP-GPE test suites tagged "EXPECTED_FAILING" as there is a bug in the test case - fix is under preparation and will be merged soon Change-Id: I2d14d70873258aead1c8988ba5880987cfd1c02c Signed-off-by: Jan Gelety <jgelety@cisco.com>
-rw-r--r--VPP_REPO_URL_CENTOS2
-rw-r--r--VPP_REPO_URL_UBUNTU2
-rw-r--r--VPP_STABLE_VER_CENTOS2
-rw-r--r--VPP_STABLE_VER_UBUNTU2
-rw-r--r--tests/vpp/func/vm_vhost/ip4/eth2p-ethip4ipsectptlispgpe-ip4base-eth-2vhost-1vm-func.robot1
-rw-r--r--tests/vpp/func/vm_vhost/ip6/eth2p-ethip6ipsectptlispgpe-ip6base-eth-2vhost-1vm-func.robot1
6 files changed, 6 insertions, 4 deletions
diff --git a/VPP_REPO_URL_CENTOS b/VPP_REPO_URL_CENTOS
index bc11e8d2a1..644415db60 100644
--- a/VPP_REPO_URL_CENTOS
+++ b/VPP_REPO_URL_CENTOS
@@ -1 +1 @@
-https://nexus.fd.io/content/repositories/fd.io.master.centos7/io/fd/vpp/
+https://nexus.fd.io/content/repositories/fd.io.stable.1804.centos7/io/fd/vpp/
diff --git a/VPP_REPO_URL_UBUNTU b/VPP_REPO_URL_UBUNTU
index 56de6b69e9..422917cbc5 100644
--- a/VPP_REPO_URL_UBUNTU
+++ b/VPP_REPO_URL_UBUNTU
@@ -1 +1 @@
-https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/
+https://nexus.fd.io/content/repositories/fd.io.stable.1804.ubuntu.xenial.main/io/fd/vpp/
diff --git a/VPP_STABLE_VER_CENTOS b/VPP_STABLE_VER_CENTOS
index 8aadf2665b..6acf867aa6 100644
--- a/VPP_STABLE_VER_CENTOS
+++ b/VPP_STABLE_VER_CENTOS
@@ -1 +1 @@
-18.04-rc0~425_g039cbfe~b3910.x86_64 \ No newline at end of file
+18.04-rc1~12_g70e1ae2~b17.x86_64 \ No newline at end of file
diff --git a/VPP_STABLE_VER_UBUNTU b/VPP_STABLE_VER_UBUNTU
index f8056ff3e8..a10e3ccc94 100644
--- a/VPP_STABLE_VER_UBUNTU
+++ b/VPP_STABLE_VER_UBUNTU
@@ -1 +1 @@
-18.04-rc0~425-g039cbfe~b3921_amd64 \ No newline at end of file
+18.04-rc1~12-g70e1ae2~b15_amd64 \ No newline at end of file
diff --git a/tests/vpp/func/vm_vhost/ip4/eth2p-ethip4ipsectptlispgpe-ip4base-eth-2vhost-1vm-func.robot b/tests/vpp/func/vm_vhost/ip4/eth2p-ethip4ipsectptlispgpe-ip4base-eth-2vhost-1vm-func.robot
index a247919fa1..464d4a5768 100644
--- a/tests/vpp/func/vm_vhost/ip4/eth2p-ethip4ipsectptlispgpe-ip4base-eth-2vhost-1vm-func.robot
+++ b/tests/vpp/func/vm_vhost/ip4/eth2p-ethip4ipsectptlispgpe-ip4base-eth-2vhost-1vm-func.robot
@@ -33,6 +33,7 @@
| Variables | resources/test_data/lisp/ipv4_ipsec_lispgpe_ipv4/ipv4_ipsec_lispgpe_ipv4.py
| ...
| Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | LISP | SKIP_VPP_PATCH
+| ... | EXPECTED_FAILING
| ...
| Test Setup | Set up functional test
| ...
diff --git a/tests/vpp/func/vm_vhost/ip6/eth2p-ethip6ipsectptlispgpe-ip6base-eth-2vhost-1vm-func.robot b/tests/vpp/func/vm_vhost/ip6/eth2p-ethip6ipsectptlispgpe-ip6base-eth-2vhost-1vm-func.robot
index d5186ddbfd..d7f2f3da7f 100644
--- a/tests/vpp/func/vm_vhost/ip6/eth2p-ethip6ipsectptlispgpe-ip6base-eth-2vhost-1vm-func.robot
+++ b/tests/vpp/func/vm_vhost/ip6/eth2p-ethip6ipsectptlispgpe-ip6base-eth-2vhost-1vm-func.robot
@@ -38,6 +38,7 @@
| Variables | resources/test_data/lisp/ipv6_lispgpe_ipv6/ipv6_lispgpe_ipsec_ipv6.py
| ...
| Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | LISP | SKIP_VPP_PATCH
+| ... | EXPECTED_FAILING
| ...
| Test Setup | Run Keywords | Set up functional test
| ... | AND | Vpp All Ra Suppress Link Layer | ${nodes}