summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVictor Morales <victor.morales@intel.com>2018-09-05 06:44:16 -0700
committerVictor Morales <victor.morales@intel.com>2018-09-05 06:47:08 -0700
commit849f6ae8239a818ed03954e581f1818899d86b9c (patch)
tree77732f84714603fb60309646ecb68e83f6464855
parent897a3ccd55fb562b029525808797d628808e689e (diff)
Use local changes to build images
The current implementation is using an external copy of the source code to buil the docker image. This approach makes hard to debug and try new changes during development phase. This change allows to sync local source code folder between host and guest machines. Change-Id: Ia723499f0e113e5adebb46a0cea6662f703695e5 Signed-off-by: Victor Morales <victor.morales@intel.com> Issue-ID: MULTICLOUD-301
-rw-r--r--.gitignore1
-rw-r--r--vagrant/Vagrantfile1
-rwxr-xr-xvagrant/installer.sh9
3 files changed, 4 insertions, 7 deletions
diff --git a/.gitignore b/.gitignore
index e6cf3268..e4c62a1e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,7 @@ target
src/github.com
src/golang.org
src/k8splugin/vendor
+src/k8splugin/.vendor-new/
src/k8splugin/kubeconfig/*
deployments/k8plugin
diff --git a/vagrant/Vagrantfile b/vagrant/Vagrantfile
index ba71ba7e..61031bba 100644
--- a/vagrant/Vagrantfile
+++ b/vagrant/Vagrantfile
@@ -106,6 +106,7 @@ Vagrant.configure("2") do |config|
config.vm.define :installer, primary: true, autostart: false do |installer|
installer.vm.hostname = "multicloud"
installer.vm.network :private_network, :ip => "10.10.10.2", :type => :static
+ installer.vm.synced_folder '../', '/root/go/src/k8-plugin-multicloud/', type: sync_type
installer.vm.provision 'shell' do |sh|
sh.path = "installer.sh"
sh.args = ['-p', '-v', '-w', '/vagrant']
diff --git a/vagrant/installer.sh b/vagrant/installer.sh
index b4886f21..5e3b32d8 100755
--- a/vagrant/installer.sh
+++ b/vagrant/installer.sh
@@ -171,23 +171,18 @@ function install_plugin {
mkdir -p /opt/{csar,kubeconfig,consul/config}
cp $HOME/.kube/config /opt/kubeconfig/krd
- export CSAR_DIR=/opt/csar
- export KUBE_CONFIG_DIR=/opt/kubeconfig
- echo "export CSAR_DIR=${CSAR_DIR}" >> /etc/environment
- echo "export KUBE_CONFIG_DIR=${KUBE_CONFIG_DIR}" >> /etc/environment
GOPATH=$(go env GOPATH)
- git clone https://git.onap.org/multicloud/k8s $GOPATH/src/k8-plugin-multicloud
pushd $GOPATH/src/k8-plugin-multicloud/deployments
./build.sh
- docker-compose up -d
- popd
if [[ -n "${testing_enabled+x}" ]]; then
+ docker-compose up -d
pushd $krd_tests
bash plugin.sh
popd
fi
+ popd
}
# _install_crictl() - Install Container Runtime Interface (CRI) CLI