Merge "Add docker job to SDC DCAE CI"

diff --git a/jenkins-config/clouds/openstack/cattle/centos7-redis-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-redis-4c-4g.cfg
index 4c0766c..975b749 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/centos7-redis-4c-4g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/centos7-redis-4c-4g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=Ubuntu 16.04 - redis - 20180101-1003
+IMAGE_NAME=CentOS 7 - redis - 20180805-2225
 LABELS=centos7-redis-4c-4g
 HARDWARE_ID=v2-highcpu-4

diff --git a/jjb/aai/aai-graphadmin.yaml b/jjb/aai/aai-graphadmin.yaml
index bd45414..a3ff36b 100644 (file)
--- a/jjb/aai/aai-graphadmin.yaml
+++ b/jjb/aai/aai-graphadmin.yaml
@@ -1,9 +1,16 @@
 ---
 - project:
-    name: aai-graphadmin
+    name: aai-graphadmin-master
     project-name: 'aai-graphadmin'
     jobs:
       - gerrit-maven-clm
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-release-version-java-daily'
+      - '{project-name}-{stream}-docker-java-daily':
+          docker-pom: 'pom.xml'
+          mvn-profile: 'docker'
+          mvn-params: '-Dmaven.test.skip=true'
     project: 'aai/graphadmin'
     stream:
       - 'master':
@@ -12,3 +19,16 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
+
+- project:
+    name: aai-graphadmin-sonar
+    jobs:
+      - gerrit-maven-sonar
+    cron: 'H 11 * * *'
+    build-node: ubuntu1604-builder-4c-4g
+    project: 'aai/graphadmin'
+    project-name: 'aai-graphadmin'
+    branch: 'master'
+    mvn-settings: 'aai-graphadmin-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'

diff --git a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
index 99df41f..fbad319 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
@@ -27,7 +27,7 @@
     jobs:
       - gerrit-maven-sonar
     cron: 'H 11 * * *'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1604-docker-8c-8g
     project: 'dcaegen2/collectors/ves'
     project-name: 'dcaegen2-collectors-ves'
     branch: 'master'

diff --git a/jjb/policy/policy-apex-pdp.yaml b/jjb/policy/policy-apex-pdp.yaml
index 6919451..4013563 100644 (file)
--- a/jjb/policy/policy-apex-pdp.yaml
+++ b/jjb/policy/policy-apex-pdp.yaml
@@ -16,6 +16,7 @@
             -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
           script:
             !include-raw-escape: 'include-raw-docker-release.sh'
+          disabled: true
 
     project: 'policy/apex-pdp'
     stream:

diff --git a/packer/provision/local-docker.yaml b/packer/provision/local-docker.yaml
index 31369b9..6686fbe 100644 (file)
--- a/packer/provision/local-docker.yaml
+++ b/packer/provision/local-docker.yaml
@@ -39,24 +39,55 @@
         state: present
       become: true
 
-    - name: Add Google Chrome key
-      apt-key:
-        url: https://dl-ssl.google.com/linux/linux_signing_key.pub
+    - name: Install python-tox
+      apt:
+        name: python-tox
         state: present
       become: true
 
-    - name: Add Google Chrome repo
-      copy: content="deb http://dl.google.com/linux/chrome/deb/ stable main" dest={{apt_file}} owner=root group=root mode=644
-      when: google_apt_exists.rc == 1
+    - apt_repository:
+        repo: ppa:jonathonf/python-3.6
+        state: present
+      become: true
+
+    - name: Update and upgrade apt packages
+      apt:
+        upgrade: yes
+        update_cache: yes
       become: true
 
-    - name: Update apt cache
-      apt: update_cache=yes
-      when: google_apt_exists.rc == 1
+    - name: Install Python 3.6 and packages
+      apt:
+        name:
+          - python3.6
+          - python3.6-dev
+          - libssl-dev
+          - libmysqlclient-dev
+          - gcc
+      become: true
+
+    - name: Install base packages
+      apt:
+        name:
+          - unzip
+          - xz-utils
+          - libxml-xpath-perl
+          - wget
+          - make
+          - npm
+          - sshuttle
+          - netcat
+          - libssl-dev
+          - libffi-dev
       become: true
 
-    - name: Install Google Chrome
+    - name: Install autorelease support packages
       apt:
-        name: pkg=google-chrome-stable state=installed
-        state: installed
+        name:
+          - firefox
+          - xmlstarlet
+          - xvfb
+          - crudini
+          - maven
+          - python-ncclient
       become: true