Merge "Add hpa module"

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 88b7dc1..791a9b6 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=CentOS 7 - redis -  - 260980909-9003
+IMAGE_NAME=CentOS 7 - redis -  - 70180101-1009
 LABELS=centos7-redis-4c-4g
 HARDWARE_ID=v2-highcpu-4

diff --git a/jjb/dcaegen2/dcaegen2-deployments.yaml b/jjb/dcaegen2/dcaegen2-deployments.yaml
index cb0f944..18f6fef 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-deployments.yaml
+++ b/jjb/dcaegen2/dcaegen2-deployments.yaml
@@ -6,7 +6,8 @@
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
-
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
     project: 'dcaegen2/deployments'
     stream:
       - 'master':

diff --git a/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml
index 3851bb6..4973e6d 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml
@@ -6,7 +6,8 @@
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
-
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
     project: 'dcaegen2/platform/deployment-handler'
     stream:
       - 'master':

diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-bpgenerator.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-bpgenerator.yaml
new file mode 100644 (file)
index 0000000..9684875
--- /dev/null
+++ b/jjb/dcaegen2/dcaegen2-platform-mod-bpgenerator.yaml
@@ -0,0 +1,31 @@
+---
+- project:
+    name: dcaegen2-platform-mod-bpgenerator
+    project: 'dcaegen2/platform'
+    project-name: 'dcaegen2-platform-mod'
+    jobs:
+      - '{project-name}-{stream}-{subproject}-verify-java'
+      - '{project-name}-{stream}-{subproject}-merge-java'
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+          version-properties-file: 'mod/bpgenerator/version.properties'
+          mvn-pom: 'mod/bpgenerator/pom.xml'
+          mvn-params: '-f mod/bpgenerator/pom.xml'
+          pattern: 'mode/bpgenerator/**'
+    subproject:
+      - 'bpgenerator':
+          pom: 'mode/bpgenerator/pom.xml'
+          pattern: 'bpgenerator/**'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'dcaegen2-platform-settings'
+    maven-deploy-properties: |
+      deployAtEnd=true
+    files: '**'
+    archive-artifacts: ''
+    build-node: 'ubuntu1604-docker-8c-8g'

diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml
new file mode 100644 (file)
index 0000000..2c79e2b
--- /dev/null
+++ b/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml
@@ -0,0 +1,34 @@
+---
+- project:
+    name: dcaegen2-platform-mod-designtool
+    project-name: dcaegen2-platform-mod
+    # git repo
+    project: dcaegen2/platform
+    jobs:
+      - '{project-name}-{stream}-{subproject}-verify-java'
+      - '{project-name}-{stream}-{subproject}-merge-java':
+          mvn-goals: 'clean install'
+    subproject:
+      - designtool:
+          pom: 'mod/designtool/pom.xml'
+          pattern: 'mod/designtool/**'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: dcaegen2-platform-settings
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1604-docker-8c-8g
+
+
+- project:
+    name: dcaegen2-platform-mod-designtool-clm
+    jobs:
+      - gerrit-maven-clm
+    nexus-iq-namespace: 'onap-'
+    project: dcaegen2/utils
+    build-node: ubuntu1604-docker-8c-8g
+    project-name: 'dcaegen2-platform-mod-designtool'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-platform-mod-designtool-settings'
+

diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml
index e476fbf..d94cb27 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml
@@ -20,6 +20,20 @@
     archive-artifacts: ''
     build-node: ubuntu1604-docker-8c-8g
 
+- project:
+    name: dcaegen2-platform-mod-genprocessor-sonar
+    jobs:
+      - gerrit-maven-sonar
+    cron: '@daily'
+    build-node: ubuntu1604-builder-4c-4g
+    project: 'dcaegen2/platform'
+    project-name: 'dcaegen2-platform-mod-genprocessor'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-platform-settings'
+    mvn-params: '-f mod/genprocessor/pom.xml'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
 - project:
     name: dcaegen2-platform-mod-genprocessor-clm
     jobs:
@@ -31,3 +45,4 @@
     mvn-params: '-f mod/genprocessor/pom.xml'
     branch: 'master'
     mvn-settings: 'dcaegen2-platform-settings'
+

diff --git a/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml
index a93fd57..4d6da53 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml
@@ -6,7 +6,8 @@
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
-
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
     project: 'dcaegen2/platform/policy-handler'
     stream:
       - 'master':

diff --git a/jjb/lf-infra-releasedockerhub.yaml b/jjb/lf-infra-releasedockerhub.yaml
new file mode 100644 (file)
index 0000000..ca2ea85
--- /dev/null
+++ b/jjb/lf-infra-releasedockerhub.yaml
@@ -0,0 +1,68 @@
+---
+- builder:
+    name: lf-onap-releasedockerhub-macro
+    builders:
+      - shell: !include-raw-escape:
+        - ../shell/run_releasedockerhub.sh
+        ##- ../shell/run_releasedockerhub.sh "{org} {summary} {verbose} {copy}"
+
+
+- job:
+    name: lf-onap-release-docker-hub
+    build-timeout: 90
+
+    project-type: freestyle
+    node: ubuntu1604-docker-8c-8g                           ## Probably don't need this much
+    disable-job: false
+    disabled: '{disable-job}'
+
+    # Runs once a week 
+    triggers:
+      - timed: '@weekly'
+
+#   Define needed parameters for lf-infra-docker-login
+    parameters:
+      - string:
+          name: DOCKER_REGISTRY
+          default: 'nexus3.onap.org'
+      - string:
+          name: REGISTRY_PORTS
+          default: '10002'
+      - string:
+          name: DOCKERHUB_REGISTRY
+          default: 'docker.io'
+
+#   Define needed parameters for lf-onap-releasedockerhub-macro
+      - string:
+          name: RELEASEDOCKERHUB_ORG
+          default: 'onap'
+          description: ''
+      - string:
+          name: RELEASEDOCKERHUB_REPO
+          default: ''
+          description: 'Only match repos that contains this string'
+      - string:
+          name: RELEASEDOCKERHUB_EXACT
+          default: ''
+          description: 'Repo has to exactly match RELEASEDOCKERHUB_REPO '
+      - string:
+          name: RELEASEDOCKERHUB_SUMMARY
+          default: 'Yes'
+          description: 'Provides a brief statistic summary of what it found, and what it should do. Activate with Yes'
+      - string:
+          name: RELEASEDOCKERHUB_VERBOSE
+          default: ''
+          description: 'Provides a verbose output of the operations. Activate with Yes'
+      - string:
+          name: RELEASEDOCKERHUB_COPY
+          default: 'Yes'
+          description: 'If a copy operation should be done from Nexus3 to docker hub. Activate with Yes'
+
+
+    builders:
+      - lf-infra-pre-build                                  ## shell/python-tools-install.sh
+      - lf-infra-docker-login:
+          global-settings-file: 'global-settings'
+          settings-file: 'onap-releasedockerhub-authz-settings'
+      - lf-onap-releasedockerhub-macro:
+

diff --git a/packer/provision/local-docker.yaml b/packer/provision/local-docker.yaml
index c3c9f17..7b9f9c0 100644 (file)
--- a/packer/provision/local-docker.yaml
+++ b/packer/provision/local-docker.yaml
@@ -66,12 +66,6 @@
         state: present
       become: true
 
-    - apt_repository:
-        repo: ppa:jonathonf/python-3.6
-        state: present
-      become: true
-      when: ansible_distribution == 'Ubuntu'
-
     - apt_repository:
         repo: ppa:deadsnakes/ppa
         state: present

diff --git a/shell/run_releasedockerhub.sh b/shell/run_releasedockerhub.sh
new file mode 100644 (file)
index 0000000..42771af
--- /dev/null
+++ b/shell/run_releasedockerhub.sh
@@ -0,0 +1,56 @@
+#!/bin/bash
+
+# SPDX-License-Identifier: EPL-1.0
+##############################################################################
+# Copyright (c) 2019 The Linux Foundation and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+##############################################################################
+
+echo "---> run_releasedockerhub.sh"
+# Ensure we fail the job if any steps fail
+# Disable 'globbing'
+set -euf -o pipefail
+
+# shellcheck disable=SC1090
+source ~/lf-env.sh
+
+lf-activate-venv lftools
+
+if [ ! -v RELEASEDOCKERHUB_ORG ]
+then
+  echo "RELEASEDOCKERHUB_ORG is not defined. For onap set it to 'onap'"
+  exit 1
+fi
+
+cmd_str="--org $RELEASEDOCKERHUB_ORG"
+if [ -v RELEASEDOCKERHUB_SUMMARY ]
+then
+    cmd_str+=" --summary"
+fi
+if [ -v RELEASEDOCKERHUB_VERBOSE ]
+then
+    cmd_str+=" --verbose"
+fi
+if [ -v RELEASEDOCKERHUB_REPO ]
+then
+    cmd_str+=" --repo $RELEASEDOCKERHUB_REPO"
+fi
+if [ -v RELEASEDOCKERHUB_EXACT ]
+then
+    cmd_str+=" --exact"
+fi
+
+
+if [ -v RELEASEDOCKERHUB_COPY ]
+then
+    cmd_str+=" --copy"
+fi
+
+echo "cmd_str = >>$cmd_str<<"
+
+# Run the releasedockerhub command in lftools
+lftools nexus docker releasedockerhub  $cmd_str