Merge "Add IEC Foundation Framework Deployment Work"

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/jenkins-config/global-vars-production.sh b/jenkins-config/global-vars-production.sh
index ba4dbbe..a779984 100644 (file)
--- a/jenkins-config/global-vars-production.sh
+++ b/jenkins-config/global-vars-production.sh
@@ -1,5 +1,4 @@
 DOCKER_REGISTRY=nexus3.akraino.org
-DOCKERHUB_REGISTRY=docker.io
 GERRIT_URL=https://gerrit.akraino.org/r
 GIT_URL=ssh://akraino-jobbuilder@gerrit.akraino.org:29418
 JENKINS_HOSTNAME=vex-yul-akraino-jenkins-prod-1

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/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