Third attempt to fix the Jenkins build. Needs to clean up the venv environment and also specify a vagnant box version that works with frameio tests
Change-Id: I22a0fac1d300372b6678e10f877d4c68affaa2f8
diff --git a/Jenkinsfile b/Jenkinsfile
index 8318e34..25ad933 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -7,6 +7,9 @@
stage 'Bring up voltha dev vm'
sh 'vagrant up voltha'
+ stage 'Remove the pre-created venv-linux'
+ sh 'vagrant ssh -c "rm -rf /cord/incubator/voltha/venv-linux"'
+
stage 'Build voltha'
sh 'vagrant ssh -c "cd /cord/incubator/voltha && source env.sh && make fetch && make build" voltha'
diff --git a/Vagrantfile b/Vagrantfile
index 6de0e0f..7ae899c 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -40,6 +40,9 @@
config.vm.define "#{settings['server_name']}" do |d|
d.ssh.forward_agent = true
d.vm.box = Box
+ if Box == "ubuntu/xenial64"
+ d.vm.box_version = "20170207.0.0"
+ end
d.vm.hostname = "#{settings['server_name']}"
d.vm.network "private_network", ip: "10.100.198.220"
d.vm.provision :shell, path: "ansible/scripts/bootstrap_ansible.sh"
diff --git a/ansible/roles/common/defaults/main.yml b/ansible/roles/common/defaults/main.yml
index f3a8595..7be66d2 100644
--- a/ansible/roles/common/defaults/main.yml
+++ b/ansible/roles/common/defaults/main.yml
@@ -17,7 +17,6 @@
- python-nose
- python-flake8
- python-scapy
-# - python-netaddr
# - python-libpcap
obsolete_services:
diff --git a/ansible/roles/docker/tasks/debian.yml b/ansible/roles/docker/tasks/debian.yml
index 7bf0434..55d905c 100644
--- a/ansible/roles/docker/tasks/debian.yml
+++ b/ansible/roles/docker/tasks/debian.yml
@@ -30,13 +30,6 @@
state: present
tags: [docker]
-- name: netaddr pip package is present
- pip:
- name: netaddr
- version: 0.7.19
- state: present
- tags: [docker]
-
- name: Debian files are present
template:
src: "{{ docker_cfg }}"