Add REPOSITORY_SUITE environment variable
We now use internal repositories like nightly, testing and stable.
REPOSITORY_SUITE variable allows to switch between these repos.
Default value:
export REPOSITORY_SUITE=stable
Added to the clusters:
- virtual-mcp-ocata-dvr
- virtual-mcp-ocata-ovs
- virtual-mcp11-dvr
- virtual-mcp11-ovs
- virtual-mcp11-dpdk
Also, ENV_NAME is not required now. By default, it will be created
from LAB_CONFIG_NAME + "_" + REPOSITORY_SUITE + "_" + BUILD_NUMBER
(BUILD_NUMBER added to separate different builds on Jenkins)
diff --git a/tcp_tests/templates/underlay/virtual-mcp11-ovs--user-data1604.yaml b/tcp_tests/templates/underlay/virtual-mcp11-ovs--user-data1604.yaml
index 2c3cb6c..05ebd66 100644
--- a/tcp_tests/templates/underlay/virtual-mcp11-ovs--user-data1604.yaml
+++ b/tcp_tests/templates/underlay/virtual-mcp11-ovs--user-data1604.yaml
@@ -48,11 +48,9 @@
#- sleep 120
- echo "Preparing base OS"
- which wget >/dev/null || (apt-get update; apt-get install -y wget)
- - echo "deb [arch=amd64] http://apt.tcpcloud.eu/nightly/ xenial main security extra tcp tcp-salt" > /etc/apt/sources.list
- - wget -O - http://apt.tcpcloud.eu/public.gpg | apt-key add -
- # saltstack repo is for minions that have the same version in the xenial and trusty (2016.3.3)
- #- echo "deb http://repo.saltstack.com/apt/ubuntu/16.04/amd64/latest xenial main" > /etc/apt/sources.list.d/saltstack.list
- #- wget -O - https://repo.saltstack.com/apt/ubuntu/16.04/amd64/latest/SALTSTACK-GPG-KEY.pub | apt-key add -
+
+ - echo "deb [arch=amd64] http://apt-mk.mirantis.com/xenial {{ REPOSITORY_SUITE }} salt extra" > /etc/apt/sources.list.d/mcp_salt.list;
+ - wget -O - http://apt-mk.mirantis.com/public.gpg | apt-key add -;
- echo "deb http://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.3 xenial main" > /etc/apt/sources.list.d/saltstack.list
- wget -O - https://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.3/SALTSTACK-GPG-KEY.pub | apt-key add -