From 3740fadd70c88f87ddb1c3da007c35d0b8417126 Mon Sep 17 00:00:00 2001
From: Rousko Atanasov <ratanasov@vmware.com>
Date: Wed, 17 Nov 2021 15:20:01 +0200
Subject: [PATCH 1/8] wip

---
 agent/installer/e2e/Vagrantfile | 70 +++++++++++++++++++++++++++++++++
 agent/installer/e2e/test-e2e.sh | 43 ++++++++++++++++++++
 agent/installer/e2e/test.sh     | 21 ++++++++++
 3 files changed, 134 insertions(+)
 create mode 100644 agent/installer/e2e/Vagrantfile
 create mode 100755 agent/installer/e2e/test-e2e.sh
 create mode 100755 agent/installer/e2e/test.sh

diff --git a/agent/installer/e2e/Vagrantfile b/agent/installer/e2e/Vagrantfile
new file mode 100644
index 000000000..93e7f6ae5
--- /dev/null
+++ b/agent/installer/e2e/Vagrantfile
@@ -0,0 +1,70 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+# All Vagrant configuration is done below. The "2" in Vagrant.configure
+# configures the configuration version (we support older styles for
+# backwards compatibility). Please don't change it unless you know what
+# you're doing.
+Vagrant.configure("2") do |config|
+  # The most common configuration options are documented and commented below.
+  # For a complete reference, please see the online documentation at
+  # https://docs.vagrantup.com.
+
+  # Every Vagrant development environment requires a box. You can search for
+  # boxes at https://vagrantcloud.com/search.
+  config.vm.box = "bento/ubuntu-20.04"
+
+  # Disable automatic box update checking. If you disable this, then
+  # boxes will only be checked for updates when the user runs
+  # `vagrant box outdated`. This is not recommended.
+  # config.vm.box_check_update = false
+
+  # Create a forwarded port mapping which allows access to a specific port
+  # within the machine from a port on the host machine. In the example below,
+  # accessing "localhost:8080" will access port 80 on the guest machine.
+  # NOTE: This will enable public access to the opened port
+  # config.vm.network "forwarded_port", guest: 80, host: 8080
+
+  # Create a forwarded port mapping which allows access to a specific port
+  # within the machine from a port on the host machine and only allow access
+  # via 127.0.0.1 to disable public access
+  # config.vm.network "forwarded_port", guest: 80, host: 8080, host_ip: "127.0.0.1"
+
+  # Create a private network, which allows host-only access to the machine
+  # using a specific IP.
+  # config.vm.network "private_network", ip: "192.168.33.10"
+
+  # Create a public network, which generally matched to bridged network.
+  # Bridged networks make the machine appear as another physical device on
+  # your network.
+  # config.vm.network "public_network"
+
+  # Share an additional folder to the guest VM. The first argument is
+  # the path on the host to the actual folder. The second argument is
+  # the path on the guest to mount the folder. And the optional third
+  # argument is a set of non-required options.
+  # config.vm.synced_folder "../data", "/vagrant_data"
+
+  # Provider-specific configuration so you can fine-tune various
+  # backing providers for Vagrant. These expose provider-specific options.
+  # Example for VirtualBox:
+  #
+  # config.vm.provider "virtualbox" do |vb|
+  #   # Display the VirtualBox GUI when booting the machine
+  #   vb.gui = true
+  #
+  #   # Customize the amount of memory on the VM:
+  #   vb.memory = "1024"
+  # end
+  #
+  # View the documentation for the provider you are using for more
+  # information on available options.
+
+  # Enable provisioning with a shell script. Additional provisioners such as
+  # Puppet, Chef, Ansible, Salt, and Docker are also available. Please see the
+  # documentation for more information about their specific syntax and use.
+  # config.vm.provision "shell", inline: <<-SHELL
+  #   apt-get update
+  #   apt-get install -y apache2
+  # SHELL
+end
diff --git a/agent/installer/e2e/test-e2e.sh b/agent/installer/e2e/test-e2e.sh
new file mode 100755
index 000000000..fd244f7d9
--- /dev/null
+++ b/agent/installer/e2e/test-e2e.sh
@@ -0,0 +1,43 @@
+#~/bin/bash
+
+#set -e
+
+INSTALLER_ROOT=`realpath ..`
+TAG=byoh-installer-e2e-test
+IMG_INGR=byoh-ingredients-deb:$TAG
+IMG_BLD=byoh-build-push-bundle:$TAG
+
+echo "===Build BYOH Bundle Builder"
+(cd agent/installer/bundle_builder/ && docker build -t $IMG_BLD .)
+(cd agent/installer/bundle_builder/ingredients/deb/ && docker build -t $IMG_INGR .)
+
+echo "===Start local bundle repo"
+BUNDLE_REPO_PORT_HOST=5000
+BUNDLE_REPO=10.26.226.219:$BUNDLE_REPO_PORT_HOST
+#BUNDLE_REPO=https://localhost
+docker run -d -p $BUNDLE_REPO_PORT_HOST:5000 --rm --name registry-$TAG registry:2.7.1
+
+K8SVER=v1.22.3
+
+echo "===Download bundle ingredients"
+DIR_ING=$PWD/$TAG-ingredients
+mkdir -p $DIR_ING && docker run --rm -v $DIR_ING:/ingredients $IMG_INGR
+
+echo "===Build and publish bundle"
+docker run --rm -v $DIR_ING:/ingredients --env BUILD_ONLY=0 $IMG_BLD $BUNDLE_REPO/byoh-bundle-ubuntu_20.04.1_x86-64_k8s_$K8SVER
+
+# Clean up ingredients dir
+rm -rf $DIR_ING
+
+pushd agent/installer/e2e
+go build ../cli
+echo "===Spin up test vm"
+vagrant up
+echo "===Install bundle inside vm"
+vagrant ssh -c "cd /vagrant && sudo ./test.sh $BUNDLE_REPO_PORT_HOST $K8SVER"
+vagrant destroy -f
+popd
+
+docker stop registry-$TAG
+
+
diff --git a/agent/installer/e2e/test.sh b/agent/installer/e2e/test.sh
new file mode 100755
index 000000000..7cde0be59
--- /dev/null
+++ b/agent/installer/e2e/test.sh
@@ -0,0 +1,21 @@
+#~/bin/bash
+
+# host machine is accessible as gateway by guest
+REPO_IP=`netstat -rn | awk '/default|^0.0.0.0/{print $2}'`
+REPO_PORT=$1
+K8SVER=$2
+
+echo "===Install Pre-requisites"
+apt-get install socat ebtables ethtool conntrack -y
+
+set -e
+
+echo "===Run Install"
+./cli --install --bundle-repo $REPO_IP:$REPO_PORT --k8s $K8SVER
+
+echo "===Run kubeadm preflight"
+kubeadm init phase preflight --ignore-preflight-errors=Cpu,Mem
+
+echo "===Run Uninstall"
+./cli --uninstall --bundle-repo $REPO_IP:$REPO_PORT --k8s $K8SVER
+

From 7a726027337a2219e40729e1687b6f2575da5d99 Mon Sep 17 00:00:00 2001
From: Rousko Atanasov <ratanasov@vmware.com>
Date: Wed, 17 Nov 2021 18:22:22 +0200
Subject: [PATCH 2/8] Same network. No hardcoded ip. Cleanup

---
 agent/installer/e2e/Vagrantfile |  1 +
 agent/installer/e2e/test-e2e.sh | 56 +++++++++++++++++++++++----------
 agent/installer/e2e/test.sh     |  1 +
 3 files changed, 41 insertions(+), 17 deletions(-)

diff --git a/agent/installer/e2e/Vagrantfile b/agent/installer/e2e/Vagrantfile
index 93e7f6ae5..d013e70e2 100644
--- a/agent/installer/e2e/Vagrantfile
+++ b/agent/installer/e2e/Vagrantfile
@@ -13,6 +13,7 @@ Vagrant.configure("2") do |config|
   # Every Vagrant development environment requires a box. You can search for
   # boxes at https://vagrantcloud.com/search.
   config.vm.box = "bento/ubuntu-20.04"
+  config.vm.define "byoh-installer-e2e-test-vm"
 
   # Disable automatic box update checking. If you disable this, then
   # boxes will only be checked for updates when the user runs
diff --git a/agent/installer/e2e/test-e2e.sh b/agent/installer/e2e/test-e2e.sh
index fd244f7d9..f80389213 100755
--- a/agent/installer/e2e/test-e2e.sh
+++ b/agent/installer/e2e/test-e2e.sh
@@ -1,33 +1,61 @@
 #~/bin/bash
 
-#set -e
+set -e
 
-INSTALLER_ROOT=`realpath ..`
 TAG=byoh-installer-e2e-test
 IMG_INGR=byoh-ingredients-deb:$TAG
 IMG_BLD=byoh-build-push-bundle:$TAG
+IMG_REG=registry:2.7.1
+CONT_REG=$TAG-registry
+NET=$TAG-network
+
+function cleanup()
+{
+    set +e
+
+    ARG=$?
+    echo "==Clean up"
+
+    docker stop $CONT_REG
+
+    docker rmi $IMG_INGR
+    docker rmi $IMG_BLD
+    docker rmi $IMG_REG
+
+    # Clean up ingredients dir
+    rm -rf $DIR_ING
+
+    docker network rm $NET
+
+    vagrant destroy -f
+
+    popd
+
+    exit $ARG
+}
+
+trap cleanup EXIT
 
 echo "===Build BYOH Bundle Builder"
 (cd agent/installer/bundle_builder/ && docker build -t $IMG_BLD .)
 (cd agent/installer/bundle_builder/ingredients/deb/ && docker build -t $IMG_INGR .)
 
+docker network create $NET
+
 echo "===Start local bundle repo"
 BUNDLE_REPO_PORT_HOST=5000
-BUNDLE_REPO=10.26.226.219:$BUNDLE_REPO_PORT_HOST
-#BUNDLE_REPO=https://localhost
-docker run -d -p $BUNDLE_REPO_PORT_HOST:5000 --rm --name registry-$TAG registry:2.7.1
-
-K8SVER=v1.22.3
+docker run -d -p $BUNDLE_REPO_PORT_HOST:5000 --rm --name $CONT_REG  --net $NET $IMG_REG
+# Lookup by host name yields "http: server gave HTTP response to HTTPS client"
+BUNDLE_REPO=`docker inspect -f '{{range.NetworkSettings.Networks}}{{.IPAddress}}{{end}}' $CONT_REG`:$BUNDLE_REPO_PORT_HOST
 
 echo "===Download bundle ingredients"
 DIR_ING=$PWD/$TAG-ingredients
 mkdir -p $DIR_ING && docker run --rm -v $DIR_ING:/ingredients $IMG_INGR
 
-echo "===Build and publish bundle"
-docker run --rm -v $DIR_ING:/ingredients --env BUILD_ONLY=0 $IMG_BLD $BUNDLE_REPO/byoh-bundle-ubuntu_20.04.1_x86-64_k8s_$K8SVER
+K8SVER=v1.22.3
 
-# Clean up ingredients dir
-rm -rf $DIR_ING
+echo "===Build and publish bundle"
+docker run --rm -v $DIR_ING:/ingredients --net $NET --env BUILD_ONLY=0 $IMG_BLD $BUNDLE_REPO/byoh/byoh-bundle-ubuntu_20.04.1_x86-64_k8s_$K8SVER
 
 pushd agent/installer/e2e
 go build ../cli
@@ -35,9 +63,3 @@ echo "===Spin up test vm"
 vagrant up
 echo "===Install bundle inside vm"
 vagrant ssh -c "cd /vagrant && sudo ./test.sh $BUNDLE_REPO_PORT_HOST $K8SVER"
-vagrant destroy -f
-popd
-
-docker stop registry-$TAG
-
-
diff --git a/agent/installer/e2e/test.sh b/agent/installer/e2e/test.sh
index 7cde0be59..402ed76be 100755
--- a/agent/installer/e2e/test.sh
+++ b/agent/installer/e2e/test.sh
@@ -1,6 +1,7 @@
 #~/bin/bash
 
 # host machine is accessible as gateway by guest
+apt install net-tools -y
 REPO_IP=`netstat -rn | awk '/default|^0.0.0.0/{print $2}'`
 REPO_PORT=$1
 K8SVER=$2

From df19ec155822ccefc1851b315d4e0b102e2e4d8c Mon Sep 17 00:00:00 2001
From: Rousko Atanasov <ratanasov@vmware.com>
Date: Thu, 18 Nov 2021 14:35:09 +0200
Subject: [PATCH 3/8] use docker compose

---
 agent/installer/e2e/build.yml   | 10 ++++++++
 agent/installer/e2e/core.yml    | 31 +++++++++++++++++++++++
 agent/installer/e2e/test-e2e.sh | 45 ++++++++++-----------------------
 agent/installer/e2e/test.sh     |  3 +--
 4 files changed, 55 insertions(+), 34 deletions(-)
 create mode 100644 agent/installer/e2e/build.yml
 create mode 100644 agent/installer/e2e/core.yml

diff --git a/agent/installer/e2e/build.yml b/agent/installer/e2e/build.yml
new file mode 100644
index 000000000..fd8ce3d8f
--- /dev/null
+++ b/agent/installer/e2e/build.yml
@@ -0,0 +1,10 @@
+services:
+  ingredients-deb:
+    build:
+      context: ../bundle_builder/ingredients/deb/
+      dockerfile: Dockerfile
+
+  bundle-builder:
+    build:
+      context: ../bundle_builder/
+      dockerfile: Dockerfile
diff --git a/agent/installer/e2e/core.yml b/agent/installer/e2e/core.yml
new file mode 100644
index 000000000..a4e5fc046
--- /dev/null
+++ b/agent/installer/e2e/core.yml
@@ -0,0 +1,31 @@
+services:
+  ingredients-deb:
+    image: ingredients-deb
+    volumes:
+      - bundle-vol:/ingredients
+
+  bundle-builder:
+    image: bundle-builder
+    command: bundle-repo.local:5000/byoh/byoh-bundle-ubuntu_20.04.1_x86-64_k8s_${K8SVER:-v1.22.3}
+    depends_on:
+      - ingredients-deb
+      - bundle-repo.local
+    environment:
+      - BUILD_ONLY=0
+    networks:
+      - app-net
+    volumes:
+      - bundle-vol:/ingredients
+
+  bundle-repo.local:
+    image: registry
+    ports:
+      - ${REPOPORT:-5005}:5000
+    networks:
+      - app-net
+
+networks:
+    app-net:
+
+volumes:
+  bundle-vol: {}
diff --git a/agent/installer/e2e/test-e2e.sh b/agent/installer/e2e/test-e2e.sh
index f80389213..fa77c9b22 100755
--- a/agent/installer/e2e/test-e2e.sh
+++ b/agent/installer/e2e/test-e2e.sh
@@ -3,11 +3,8 @@
 set -e
 
 TAG=byoh-installer-e2e-test
-IMG_INGR=byoh-ingredients-deb:$TAG
-IMG_BLD=byoh-build-push-bundle:$TAG
-IMG_REG=registry:2.7.1
-CONT_REG=$TAG-registry
-NET=$TAG-network
+export REPOPORT=5005
+export K8SVER="v1.22.3"
 
 function cleanup()
 {
@@ -16,19 +13,13 @@ function cleanup()
     ARG=$?
     echo "==Clean up"
 
-    docker stop $CONT_REG
-
-    docker rmi $IMG_INGR
-    docker rmi $IMG_BLD
-    docker rmi $IMG_REG
-
-    # Clean up ingredients dir
-    rm -rf $DIR_ING
-
-    docker network rm $NET
+    docker-compose -p $TAG -f build.yml -f core.yml down --rmi all --volumes
 
     vagrant destroy -f
 
+    rm cli
+    rm -rf $K8SVER
+
     popd
 
     exit $ARG
@@ -36,30 +27,20 @@ function cleanup()
 
 trap cleanup EXIT
 
-echo "===Build BYOH Bundle Builder"
-(cd agent/installer/bundle_builder/ && docker build -t $IMG_BLD .)
-(cd agent/installer/bundle_builder/ingredients/deb/ && docker build -t $IMG_INGR .)
-
-docker network create $NET
-
-echo "===Start local bundle repo"
-BUNDLE_REPO_PORT_HOST=5000
-docker run -d -p $BUNDLE_REPO_PORT_HOST:5000 --rm --name $CONT_REG  --net $NET $IMG_REG
-# Lookup by host name yields "http: server gave HTTP response to HTTPS client"
-BUNDLE_REPO=`docker inspect -f '{{range.NetworkSettings.Networks}}{{.IPAddress}}{{end}}' $CONT_REG`:$BUNDLE_REPO_PORT_HOST
+pushd agent/installer/e2e
 
 echo "===Download bundle ingredients"
-DIR_ING=$PWD/$TAG-ingredients
-mkdir -p $DIR_ING && docker run --rm -v $DIR_ING:/ingredients $IMG_INGR
+docker-compose -p $TAG -f core.yml -f build.yml up --build ingredients-deb
 
-K8SVER=v1.22.3
+echo "===Starting bundle repository"
+docker-compose -p $TAG -f core.yml -f build.yml up --build bundle-repo.local &
 
 echo "===Build and publish bundle"
-docker run --rm -v $DIR_ING:/ingredients --net $NET --env BUILD_ONLY=0 $IMG_BLD $BUNDLE_REPO/byoh/byoh-bundle-ubuntu_20.04.1_x86-64_k8s_$K8SVER
+docker-compose -p $TAG -f core.yml -f build.yml up --build bundle-builder
 
-pushd agent/installer/e2e
+echo "===Build cli"
 go build ../cli
 echo "===Spin up test vm"
 vagrant up
 echo "===Install bundle inside vm"
-vagrant ssh -c "cd /vagrant && sudo ./test.sh $BUNDLE_REPO_PORT_HOST $K8SVER"
+vagrant ssh -c "cd /vagrant && sudo ./test.sh $REPOPORT $K8SVER"
diff --git a/agent/installer/e2e/test.sh b/agent/installer/e2e/test.sh
index 402ed76be..aaaae2d48 100755
--- a/agent/installer/e2e/test.sh
+++ b/agent/installer/e2e/test.sh
@@ -1,8 +1,7 @@
 #~/bin/bash
 
 # host machine is accessible as gateway by guest
-apt install net-tools -y
-REPO_IP=`netstat -rn | awk '/default|^0.0.0.0/{print $2}'`
+REPO_IP=$(/sbin/ip route | awk '/default/ { print $3 }')
 REPO_PORT=$1
 K8SVER=$2
 

From 78a864d730967e712843586ff86de9096193e471 Mon Sep 17 00:00:00 2001
From: Rousko Atanasov <ratanasov@vmware.com>
Date: Thu, 18 Nov 2021 14:45:51 +0200
Subject: [PATCH 4/8] fix cleanup

---
 agent/installer/e2e/test-e2e.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/agent/installer/e2e/test-e2e.sh b/agent/installer/e2e/test-e2e.sh
index fa77c9b22..1f4fd2111 100755
--- a/agent/installer/e2e/test-e2e.sh
+++ b/agent/installer/e2e/test-e2e.sh
@@ -18,7 +18,7 @@ function cleanup()
     vagrant destroy -f
 
     rm cli
-    rm -rf $K8SVER
+    rm -rf $K8SVER*
 
     popd
 

From 2723c25dbfcf1424142a9b303ed1cece1c508e31 Mon Sep 17 00:00:00 2001
From: Rousko Atanasov <ratanasov@vmware.com>
Date: Thu, 18 Nov 2021 14:57:09 +0200
Subject: [PATCH 5/8] rename files

---
 agent/installer/e2e/test-e2e.sh   | 46 ----------------------------
 agent/installer/e2e/test-in-vm.sh | 21 +++++++++++++
 agent/installer/e2e/test.sh       | 51 +++++++++++++++++++++++--------
 3 files changed, 59 insertions(+), 59 deletions(-)
 delete mode 100755 agent/installer/e2e/test-e2e.sh
 create mode 100755 agent/installer/e2e/test-in-vm.sh

diff --git a/agent/installer/e2e/test-e2e.sh b/agent/installer/e2e/test-e2e.sh
deleted file mode 100755
index 1f4fd2111..000000000
--- a/agent/installer/e2e/test-e2e.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-#~/bin/bash
-
-set -e
-
-TAG=byoh-installer-e2e-test
-export REPOPORT=5005
-export K8SVER="v1.22.3"
-
-function cleanup()
-{
-    set +e
-
-    ARG=$?
-    echo "==Clean up"
-
-    docker-compose -p $TAG -f build.yml -f core.yml down --rmi all --volumes
-
-    vagrant destroy -f
-
-    rm cli
-    rm -rf $K8SVER*
-
-    popd
-
-    exit $ARG
-}
-
-trap cleanup EXIT
-
-pushd agent/installer/e2e
-
-echo "===Download bundle ingredients"
-docker-compose -p $TAG -f core.yml -f build.yml up --build ingredients-deb
-
-echo "===Starting bundle repository"
-docker-compose -p $TAG -f core.yml -f build.yml up --build bundle-repo.local &
-
-echo "===Build and publish bundle"
-docker-compose -p $TAG -f core.yml -f build.yml up --build bundle-builder
-
-echo "===Build cli"
-go build ../cli
-echo "===Spin up test vm"
-vagrant up
-echo "===Install bundle inside vm"
-vagrant ssh -c "cd /vagrant && sudo ./test.sh $REPOPORT $K8SVER"
diff --git a/agent/installer/e2e/test-in-vm.sh b/agent/installer/e2e/test-in-vm.sh
new file mode 100755
index 000000000..21de215ad
--- /dev/null
+++ b/agent/installer/e2e/test-in-vm.sh
@@ -0,0 +1,21 @@
+#~/bin/bash
+
+# host machine is accessible as gateway by guest
+REPO_IP=$(/sbin/ip route | awk '/default/ { print $3 }')
+REPO_PORT=$1
+K8SVER=$2
+
+echo "===Install Pre-requisites"
+apt-get install socat ebtables ethtool conntrack -y
+
+set -e
+
+echo "===Run Install"
+./cli --install --bundle-repo $REPO_IP:$REPO_PORT/byoh --k8s $K8SVER
+
+echo "===Run kubeadm preflight"
+kubeadm init phase preflight --ignore-preflight-errors=Cpu,Mem
+
+echo "===Run Uninstall"
+./cli --uninstall --k8s $K8SVER
+
diff --git a/agent/installer/e2e/test.sh b/agent/installer/e2e/test.sh
index aaaae2d48..e653a11ab 100755
--- a/agent/installer/e2e/test.sh
+++ b/agent/installer/e2e/test.sh
@@ -1,21 +1,46 @@
 #~/bin/bash
 
-# host machine is accessible as gateway by guest
-REPO_IP=$(/sbin/ip route | awk '/default/ { print $3 }')
-REPO_PORT=$1
-K8SVER=$2
+set -e
 
-echo "===Install Pre-requisites"
-apt-get install socat ebtables ethtool conntrack -y
+TAG=byoh-installer-e2e-test
+export REPOPORT=5005
+export K8SVER="v1.22.3"
 
-set -e
+function cleanup()
+{
+    set +e
+
+    ARG=$?
+    echo "==Clean up"
+
+    docker-compose -p $TAG -f build.yml -f core.yml down --rmi all --volumes
+
+    vagrant destroy -f
+
+    rm cli
+    rm -rf $K8SVER*
+
+    popd
+
+    exit $ARG
+}
+
+trap cleanup EXIT
+
+pushd agent/installer/e2e
 
-echo "===Run Install"
-./cli --install --bundle-repo $REPO_IP:$REPO_PORT --k8s $K8SVER
+echo "===Download bundle ingredients"
+docker-compose -p $TAG -f core.yml -f build.yml up --build ingredients-deb
 
-echo "===Run kubeadm preflight"
-kubeadm init phase preflight --ignore-preflight-errors=Cpu,Mem
+echo "===Starting bundle repository"
+docker-compose -p $TAG -f core.yml -f build.yml up --build bundle-repo.local &
 
-echo "===Run Uninstall"
-./cli --uninstall --bundle-repo $REPO_IP:$REPO_PORT --k8s $K8SVER
+echo "===Build and publish bundle"
+docker-compose -p $TAG -f core.yml -f build.yml up --build bundle-builder
 
+echo "===Build cli"
+go build ../cli
+echo "===Spin up test vm"
+vagrant up
+echo "===Install bundle inside vm"
+vagrant ssh -c "cd /vagrant && sudo ./test-in-vm.sh $REPOPORT $K8SVER"

From c3983f113bb8ce3dd7ae0a7db6b619cb0045e55b Mon Sep 17 00:00:00 2001
From: Rousko Atanasov <ratanasov@vmware.com>
Date: Thu, 18 Nov 2021 15:38:39 +0200
Subject: [PATCH 6/8] Run from local dir

---
 agent/installer/e2e/test.sh | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/agent/installer/e2e/test.sh b/agent/installer/e2e/test.sh
index e653a11ab..8d495390b 100755
--- a/agent/installer/e2e/test.sh
+++ b/agent/installer/e2e/test.sh
@@ -8,9 +8,10 @@ export K8SVER="v1.22.3"
 
 function cleanup()
 {
+    ARG=$?
+
     set +e
 
-    ARG=$?
     echo "==Clean up"
 
     docker-compose -p $TAG -f build.yml -f core.yml down --rmi all --volumes
@@ -20,15 +21,11 @@ function cleanup()
     rm cli
     rm -rf $K8SVER*
 
-    popd
-
     exit $ARG
 }
 
 trap cleanup EXIT
 
-pushd agent/installer/e2e
-
 echo "===Download bundle ingredients"
 docker-compose -p $TAG -f core.yml -f build.yml up --build ingredients-deb
 
@@ -44,3 +41,5 @@ echo "===Spin up test vm"
 vagrant up
 echo "===Install bundle inside vm"
 vagrant ssh -c "cd /vagrant && sudo ./test-in-vm.sh $REPOPORT $K8SVER"
+
+echo "===PASS"

From bd47cbe9091254da1d82213275ad497a062cd78a Mon Sep 17 00:00:00 2001
From: Rousko Atanasov <ratanasov@vmware.com>
Date: Thu, 18 Nov 2021 15:39:10 +0200
Subject: [PATCH 7/8] update local dev

---
 docs/local_dev.md | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/docs/local_dev.md b/docs/local_dev.md
index d50284be0..f203f0db2 100644
--- a/docs/local_dev.md
+++ b/docs/local_dev.md
@@ -291,3 +291,19 @@ sudo ./cli --install --os Ubuntu_20.04.1_x86-64 --bundle-repo 10.26.226.219:5000
 # Will override the OS detection, use the specified repo and uninstall
 sudo ./cli --uninstall --os Ubuntu_20.04.1_x86-64 --bundle-repo 10.26.226.219:5000/repo --k8s v1.22.3
 ```
+
+## Run end to end test
+Vagrant is required.
+
+```shell
+(cd agent/installer/bundle_builder/e2e && ./test.sh)
+```
+This test executes the following workflow:
+- download upstream bundle contents
+- start local repo
+- build a BYOH bundle and upload it to the local repo
+- spin up a Ubuntu 20.04 VM and inside it run
+-- cli install with local repo
+-- kubeadm init phase preflight
+-- cli uninstall
+Upon success return 0.

From 0301cd4d06811bddf6653756454e7def1ac298bd Mon Sep 17 00:00:00 2001
From: ratanasovvmw <86951923+ratanasovvmw@users.noreply.github.com>
Date: Thu, 18 Nov 2021 15:49:36 +0200
Subject: [PATCH 8/8] Update formatting

---
 docs/local_dev.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/docs/local_dev.md b/docs/local_dev.md
index f203f0db2..55a9bb97e 100644
--- a/docs/local_dev.md
+++ b/docs/local_dev.md
@@ -303,7 +303,8 @@ This test executes the following workflow:
 - start local repo
 - build a BYOH bundle and upload it to the local repo
 - spin up a Ubuntu 20.04 VM and inside it run
--- cli install with local repo
--- kubeadm init phase preflight
--- cli uninstall
+  - cli install with local repo
+  - kubeadm init phase preflight
+  - cli uninstall
+
 Upon success return 0.