Merge "correct openolt version for the macro chart job"
diff --git a/jjb/pipeline/bbsim-validation.groovy b/jjb/pipeline/bbsim-validation.groovy
index 14392c9..1cca12a 100644
--- a/jjb/pipeline/bbsim-validation.groovy
+++ b/jjb/pipeline/bbsim-validation.groovy
@@ -117,17 +117,17 @@
            JOBS_TIMEOUT=900 ./helm-repo-tools/wait_for_pods.sh
 
            helm dep up xos-core
-           helm install xos-core -n xos-core -f $WORKSPACE/pod-configs/kubernetes-configs/${params.deploymentConfig}
+           helm install xos-core -n xos-core
 
            helm dep update xos-profiles/seba-services
-           helm install xos-profiles/seba-services -n seba-services -f $WORKSPACE/pod-configs/kubernetes-configs/${params.deploymentConfig}
+           helm install xos-profiles/seba-services -n seba-services
            JOBS_TIMEOUT=900 ./helm-repo-tools/wait_for_pods.sh
 
-	       helm dep update xos-profiles/base-kubernetes
-	       helm install xos-profiles/base-kubernetes -n base-kubernetes -f $WORKSPACE/pod-configs/kubernetes-configs/${params.deploymentConfig}
+           helm dep update xos-profiles/base-kubernetes
+           helm install xos-profiles/base-kubernetes -n base-kubernetes
 
            helm dep update workflows/att-workflow
-           helm install workflows/att-workflow -n att-workflow -f $WORKSPACE/pod-configs/kubernetes-configs/${params.deploymentConfig}
+           helm install workflows/att-workflow -n att-workflow --set att-workflow-driver.kafkaService=cord-kafka
 
            # wait for services to load
            JOBS_TIMEOUT=900 ./helm-repo-tools/wait_for_jobs.sh
@@ -181,8 +181,6 @@
          kubectl logs bbsim-api-test --namespace default
          kubectl get pods --all-namespaces
 
-         curl http://127.0.0.1:30125/api/v1/devices || true
-
          # copy robot logs
          if [ -d RobotLogs ]; then rm -r RobotLogs; fi; mkdir RobotLogs
          cp -r /tmp/helm_test_bbsim_logs_*/*ml ./RobotLogs
diff --git a/jjb/siab-e2e.yaml b/jjb/siab-e2e.yaml
index 1549e08..b5b1935 100644
--- a/jjb/siab-e2e.yaml
+++ b/jjb/siab-e2e.yaml
@@ -52,7 +52,7 @@
 
           cd cord/automation-tools/seba-in-a-box
           [ -e /usr/bin/kubeadm ] && make reset-kubeadm
-          make && make run-tests TESTTAGS=test1
+          make && make run-tests
 
     publishers:
       - email:
diff --git a/packer/provision/basebuild.sh b/packer/provision/basebuild.sh
index 17d68e0..f16ae90 100644
--- a/packer/provision/basebuild.sh
+++ b/packer/provision/basebuild.sh
@@ -86,16 +86,20 @@
     # install basic sofware requirements
     apt-get install -y \
         "docker-ce=17.06*" \
+        apt-transport-https \
         ansible \
         build-essential \
         bzip2 \
         curl \
+        ebtables \
+        ethtool \
         git \
         golang-1.10-go \
         httpie \
-        "kubeadm=1.11.3-*" \
-        "kubelet=1.11.3-*" \
-        "kubectl=1.11.3-*" \
+        jq \
+        "kubeadm=1.12.4-*" \
+        "kubelet=1.12.4-*" \
+        "kubectl=1.12.4-*" \
         less \
         libmysqlclient-dev \
         libpcap-dev \
@@ -240,6 +244,12 @@
 jenkins ALL=(ALL) NOPASSWD:SETENV: CMDS
 EOF
 
+    # remove apparmor
+    service apparmor stop
+    update-rc.d -f apparmor remove
+    apt-get remove apparmor-utils libapparmor-perl apparmor
+    update-grub
+
     # clean up
     apt-get clean
     apt-get purge -y
diff --git a/packer/provision/baseline.sh b/packer/provision/baseline.sh
index e34d7b8..9c08069 100644
--- a/packer/provision/baseline.sh
+++ b/packer/provision/baseline.sh
@@ -228,6 +228,7 @@
     apt-get upgrade -m
     apt-get dist-upgrade -m
 
+    apt-get update -m
     ensure_ubuntu_install unzip xz-utils puppet git libxml-xpath-perl
 
     # install Java 7