Merge "Adding tasks for onap-ui in ci_management project"

diff --git a/jenkins-config/clouds/openstack/cattle/queue-docker-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/queue-docker-4c-4g.cfg
index c98d053..22bc7c4 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/queue-docker-4c-4g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/queue-docker-4c-4g.cfg
@@ -1,4 +1,4 @@
-IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - x86_64 - 20180824-193210.563
+IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - x86_64 - 20180903-000118.904
 LABELS=queue-docker-4c-4g
 HARDWARE_ID=v2-highcpu-4
 INSTANCE_CAP=1

diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-8c-8g.cfg
index 4f82e4c..60167f2 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-8c-8g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-8c-8g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - x86_64 - 20180824-193210.563
+IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - x86_64 - 20180903-000118.904
 LABELS=ubuntu1604-docker-8c-8g
 HARDWARE_ID=v2-highcpu-8

diff --git a/jjb/dcaegen2/dcaegen2-services-prh.yaml b/jjb/dcaegen2/dcaegen2-services-prh.yaml
index b555fd8..0c54a1b 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-services-prh.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-prh.yaml
@@ -7,11 +7,6 @@
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-{stream}-docker-java-shell-daily':
-          mvn-goals: 'clean package docker:build -DpushImage'
-          # No-op
-          script: '/bin/true'
-          build-node: 'ubuntu1604-docker-8c-8g'
 
     project: 'dcaegen2/services/prh'
     stream:
@@ -29,7 +24,7 @@
     jobs:
       - gerrit-maven-sonar
     cron: 'H 11 * * *'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1604-docker-8c-8g
     project: 'dcaegen2/services/prh'
     project-name: 'dcaegen2-services-prh'
     branch: 'master'

diff --git a/packer/provision/local-docker.yaml b/packer/provision/local-docker.yaml
index 6627d4d..ecf9e46 100644 (file)
--- a/packer/provision/local-docker.yaml
+++ b/packer/provision/local-docker.yaml
@@ -90,7 +90,6 @@
     - name: Install autorelease support packages
       apt:
         name:
-          - firefox
           - xmlstarlet
           - xvfb
           - crudini
@@ -162,3 +161,18 @@
         mode: 0755
         remote_src: yes
       become: true
+
+    - name: Download Firefox version 55.0.3
+      unarchive:
+        src: https://download-installer.cdn.mozilla.net/pub/firefox/releases/55.0.3/linux-x86_64/en-US/firefox-55.0.3.tar.bz2
+        dest: /tmp
+        mode: 0755
+        remote_src: yes
+      become: true
+
+    - name: Create symbolic link to firefox bin
+      file:
+        src: "/usr/bin/firefox-bin/firefox/firefox"
+        dest: "/usr/bin/firefox"
+        state: link
+      become: true