fixing nightly build after the chameleon escaped...
Chameleon left so to catch him, we had to mount the entire cord
repo to allow voltha to build the chameleon container.
Change-Id: I60db604fd557aa0d6f7d3995951d403af39cb641
diff --git a/BUILD.md b/BUILD.md
index f102add..8dcb96e 100644
--- a/BUILD.md
+++ b/BUILD.md
@@ -34,7 +34,7 @@
cd voltha
vagrant up # when you do this for the first time, this will take considerable time
vagrant ssh # the rest to be executed inside the vagrant VM
-cd /voltha
+cd /cord/incubator/voltha
. env.sh
make fetch
make
diff --git a/Jenkinsfile b/Jenkinsfile
index ab3fc30..ff7b0c3 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -8,13 +8,13 @@
sh 'vagrant up voltha'
stage 'Build voltha'
- sh 'vagrant ssh -c "cd /voltha && source env.sh && make fetch && make" voltha'
+ sh 'vagrant ssh -c "cd /cord/incubator/voltha && source env.sh && make fetch && make" voltha'
stage 'Bring up voltha containers'
- sh 'vagrant ssh -c "cd /voltha && source env.sh && docker-compose -f compose/docker-compose-system-test.yml up -d" voltha'
+ sh 'vagrant ssh -c "cd /cord/incubator/voltha && source env.sh && docker-compose -f compose/docker-compose-system-test.yml up -d" voltha'
stage 'Run Integration Tests'
- sh 'vagrant ssh -c "cd /voltha && source env.sh && make smoke-test" voltha'
+ sh 'vagrant ssh -c "cd /cord/incubator/voltha && source env.sh && make smoke-test" voltha'
currentBuild.result = 'SUCCESS'
slackSend channel: '#voltha', color: 'good', message: "${env.JOB_NAME} (${env.BUILD_NUMBER}) Build success.\n${env.BUILD_URL}"
diff --git a/Makefile b/Makefile
index d413899..6d9c71a 100644
--- a/Makefile
+++ b/Makefile
@@ -184,7 +184,7 @@
run-as-root-tests:
- docker run -i --rm -v /voltha:/voltha --privileged cord/voltha-base env PYTHONPATH=/voltha python /voltha/tests/itests/run_as_root/test_frameio.py
+ docker run -i --rm -v /cord/incubator/voltha:/voltha --privileged cord/voltha-base env PYTHONPATH=/voltha python /voltha/tests/itests/run_as_root/test_frameio.py
flake8: $(DIRS_FLAKE8)
diff --git a/Vagrantfile b/Vagrantfile
index 9ea9dc3..2173a16 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -4,9 +4,9 @@
Vagrant.configure(2) do |config|
if (/cygwin|mswin|mingw|bccwin|wince|emx/ =~ RUBY_PLATFORM) != nil
- config.vm.synced_folder ".", "/voltha", mount_options: ["dmode=700,fmode=600"]
+ config.vm.synced_folder "../..", "/cord", mount_options: ["dmode=700,fmode=600"]
else
- config.vm.synced_folder ".", "/voltha"
+ config.vm.synced_folder "../..", "/cord"
end
config.vm.define "voltha" do |d|
@@ -15,8 +15,8 @@
d.vm.hostname = "voltha"
d.vm.network "private_network", ip: "10.100.198.220"
d.vm.provision :shell, path: "ansible/scripts/bootstrap_ansible.sh"
- d.vm.provision :shell, inline: "PYTHONUNBUFFERED=1 ansible-playbook /voltha/ansible/voltha.yml -c local"
- d.vm.provision :shell, inline: "cd /voltha && source env.sh && make install-protoc && chmod 777 /tmp/fluentd"
+ d.vm.provision :shell, inline: "PYTHONUNBUFFERED=1 ansible-playbook /cord/incubator/voltha/ansible/voltha.yml -c local"
+ d.vm.provision :shell, inline: "cd /cord/incubator/voltha && source env.sh && make install-protoc && chmod 777 /tmp/fluentd"
d.vm.provider "virtualbox" do |v|
v.memory = 6144
end
diff --git a/ansible/scripts/bootstrap_ansible.sh b/ansible/scripts/bootstrap_ansible.sh
index 183ac4a..421017e 100755
--- a/ansible/scripts/bootstrap_ansible.sh
+++ b/ansible/scripts/bootstrap_ansible.sh
@@ -23,4 +23,4 @@
apt-add-repository ppa:ansible/ansible
apt-get update
apt-get install -y ansible apt-transport-https
-cp /voltha/ansible/ansible.cfg /etc/ansible/ansible.cfg
+cp /cord/incubator/voltha/ansible/ansible.cfg /etc/ansible/ansible.cfg