Merge "New JJB files for addon-onap project"

diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-8c-8g.cfg
new file mode 100644 (file)
index 0000000..c6f2c02
--- /dev/null
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-8c-8g.cfg
@@ -0,0 +1,2 @@
+IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - 20180724-181244.462
+HARDWARE_ID=v2-highcpu-8

diff --git a/jenkins-config/global-vars-production.sh b/jenkins-config/global-vars-production.sh
index a098d22..10c1b3d 100644 (file)
--- a/jenkins-config/global-vars-production.sh
+++ b/jenkins-config/global-vars-production.sh
@@ -1,7 +1,9 @@
+DOCKER_REGISTRY=nexus3.akraino.org
 GERRIT_URL=https://gerrit.akraino.org/r
 GIT_URL=ssh://akraino-jobbuilder@gerrit.akraino.org:29418
 JENKINS_HOSTNAME=vex-yul-akraino-jenkins-prod-1
 LOGS_SERVER=https://logs.akraino.org
 NEXUS_URL=https://nexus.akraino.org
+REGISTRY_PORTS=10001 10002 10003 10004
 SILO=production
 SONAR_URL=https://sonar.akraino.org

diff --git a/jenkins-config/global-vars-sandbox.sh b/jenkins-config/global-vars-sandbox.sh
index a0294f5..1818ae6 100644 (file)
--- a/jenkins-config/global-vars-sandbox.sh
+++ b/jenkins-config/global-vars-sandbox.sh
@@ -1,7 +1,9 @@
+DOCKER_REGISTRY=nexus3.akraino.org
 GERRIT_URL=https://gerrit.akraino.org/r
 GIT_URL=ssh://akraino-jobbuilder@gerrit.akraino.org:29418
 JENKINS_HOSTNAME=vex-yul-akraino-jenkins-sandbox-1
 LOGS_SERVER=https://logs.akraino.org
 NEXUS_URL=https://nexus.akraino.org
+REGISTRY_PORTS=10001 10002 10003 10004
 SILO=sandbox
 SONAR_URL=https://sonar.akraino.org

diff --git a/jjb/ci-management/ci-jobs.yaml b/jjb/ci-management/ci-jobs.yaml
index 33ccd86..25fc83c 100644 (file)
--- a/jjb/ci-management/ci-jobs.yaml
+++ b/jjb/ci-management/ci-jobs.yaml
@@ -8,6 +8,7 @@
     project: ci-management
     project-name: ci-management
     build-node: centos7-builder-2c-1g
+    jjb-version: 2.0.10
 
     views:
       - common-view

diff --git a/jjb/ci-management/ci-packer.yaml b/jjb/ci-management/ci-packer.yaml
index c80bd87..e33b942 100644 (file)
--- a/jjb/ci-management/ci-packer.yaml
+++ b/jjb/ci-management/ci-packer.yaml
@@ -21,3 +21,16 @@
     platforms:
       - centos-7
       - ubuntu-16.04
+
+- project:
+    name: packer-docker-jobs
+    jobs:
+      - gerrit-packer-merge
+
+    project: ci-management
+    project-name: ci-management
+    build-node: centos7-builder-2c-1g
+
+    templates: docker
+    platforms:
+      - ubuntu-16.04

diff --git a/packer/provision/local-docker.yaml b/packer/provision/local-docker.yaml
new file mode 120000 (symlink)
index 0000000..a60e9be
--- /dev/null
+++ b/packer/provision/local-docker.yaml
@@ -0,0 +1 @@
+../common-packer/provision/local-docker.yaml
\ No newline at end of file

diff --git a/packer/templates/docker.json b/packer/templates/docker.json
new file mode 120000 (symlink)
index 0000000..edea6d2
--- /dev/null
+++ b/packer/templates/docker.json
@@ -0,0 +1 @@
+../common-packer/templates/docker.json
\ No newline at end of file