Merge "Add new job for deploying kni on AWS"

diff --git a/.gitignore b/.gitignore
index c22c00a..ce5c482 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,6 @@ cloud-env.json
 
 # Maven
 target/
+
+# Intellij IDEs
+.idea

diff --git a/jjb/akraino-templates/akraino-ta-common-templates.yaml b/jjb/akraino-templates/akraino-ta-common-templates.yaml
index 0d478f2..426ab12 100644 (file)
--- a/jjb/akraino-templates/akraino-ta-common-templates.yaml
+++ b/jjb/akraino-templates/akraino-ta-common-templates.yaml
@@ -12,7 +12,7 @@
       work/**/*.json
       work/tmp/rpms/mock_config/**
     build-days-to-keep: 30
-    build-timeout: 60
+    build-timeout: 90
     branch: master
     stream: master
     project-type: freestyle

diff --git a/jjb/iec/iec-compass-destroy.sh b/jjb/iec/iec-compass-destroy.sh
index 5f0a072..fbd448b 100755 (executable)
--- a/jjb/iec/iec-compass-destroy.sh
+++ b/jjb/iec/iec-compass-destroy.sh
@@ -2,4 +2,8 @@
 set -e
 
 rm -rf compass4nfv
+sudo virsh destroy host1
+sudo virsh destroy host2
+sudo virsh destroy host3
+
 exit 0

diff --git a/jjb/iec/iec-fdn-install.sh b/jjb/iec/iec-fdn-install.sh
new file mode 100755 (executable)
index 0000000..75697ef
--- /dev/null
+++ b/jjb/iec/iec-fdn-install.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+set -e
+
+sleep 10
+echo "Start IEC installation:"
+rm -rf iec
+rm -rf ~/.ssh/known_hosts
+
+git clone "https://gerrit.akraino.org/r/iec"
+
+cd iec/src/foundation/scripts
+
+sed -i.bak 's/10.169.36.152/10.1.0.50/g' ./config
+sed -i "/^K8S_MASTERPW=/cK8S_MASTERPW=\"root\"" ./config
+sed -i "/^HOST_USER=/cHOST_USER=\${HOST_USER:-root}" ./config
+sed -i "s/10.169.40.106,123456/10.1.0.51,root\"\n\"10.1.0.52,root/g" ./config
+HOST_USER=root
+export HOST_USER
+sudo ./startup.sh
+
+
+exit 0

diff --git a/jjb/iec/iec.yaml b/jjb/iec/iec.yaml
index 8e2546b..c63f546 100644 (file)
--- a/jjb/iec/iec.yaml
+++ b/jjb/iec/iec.yaml
@@ -195,6 +195,8 @@
                 !include-raw-escape: ./iec-compass-build.sh
             - shell:
                 !include-raw-escape: ./iec-compass-deploy.sh
+            - shell:
+                !include-raw-escape: ./iec-fdn-install.sh
             - shell:
                 !include-raw-escape: ./iec-compass-destroy.sh
       - conditional-step:

diff --git a/jjb/ta/caas-helm.yaml b/jjb/ta/caas-helm.yaml
index 631c50a..128f8d8 100644 (file)
--- a/jjb/ta/caas-helm.yaml
+++ b/jjb/ta/caas-helm.yaml
@@ -5,7 +5,7 @@
     project-type:
         - merge
         - verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos7-builder-8c-8g
     stream: master
     jobs:
       - akraino-project-stream-type-ta

diff --git a/jjb/ta/caas-kubernetes.yaml b/jjb/ta/caas-kubernetes.yaml
index 20f0dd2..19b114d 100644 (file)
--- a/jjb/ta/caas-kubernetes.yaml
+++ b/jjb/ta/caas-kubernetes.yaml
@@ -5,7 +5,7 @@
     project-type:
         - merge
         - verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos7-builder-8c-8g
     stream: master
     jobs:
       - akraino-project-stream-type-ta

diff --git a/jjb/ta/ironic.yaml b/jjb/ta/ironic.yaml
index bfc8098..8368c0e 100644 (file)
--- a/jjb/ta/ironic.yaml
+++ b/jjb/ta/ironic.yaml
@@ -5,7 +5,7 @@
     project-type:
         - merge
         - verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos7-builder-8c-8g
     stream: master
     jobs:
       - akraino-project-stream-type-ta