Merge "Push cps docker images to repository on merge"

diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-8g.cfg
index 9f24c4b..e9c0098 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-8g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-8g.cfg
@@ -1,4 +1,4 @@
-IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20210129-195200.311
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20210202-193426.087
 LABELS=ubuntu1804-docker-8c-8g
 HARDWARE_ID=v2-highcpu-8
 VOLUME_SIZE=20

diff --git a/jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml b/jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml
index cb83ce3..04c26c0 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml
@@ -1,4 +1,57 @@
 ---
+- project:
+      name: dcaegen2-platform-ves-openapi-manager
+      project-name: 'dcaegen2-platform-ves-openapi-manager'
+      java-version: openjdk11
+      jobs:
+          - '{project-name}-{stream}-verify-java'
+          - '{project-name}-{stream}-merge-java'
+          - gerrit-maven-stage:
+                sign-artifacts: true
+                build-node: centos7-docker-8c-8g
+                maven-versions-plugin: true
+          - gerrit-maven-docker-stage:
+                build-node: ubuntu1804-docker-8c-8g
+                container-public-registry: 'nexus3.onap.org:10001'
+                container-staging-registry: 'nexus3.onap.org:10003'
+                mvn-goals: 'clean package docker:build -DpushImageTag'
+          - '{project-name}-gerrit-release-jobs':
+                build-node: centos7-docker-8c-8g
+
+      project: 'dcaegen2/platform/ves-openapi-manager'
+      stream:
+          - 'master':
+                branch: 'master'
+      mvn-settings: 'dcaegen2-platform-ves-openapi-manager-settings'
+      # due to a strange macro / variable translation problem this needs
+      # to be passed as a string block to properly get the properties
+      # correctly defined in the job
+      maven-deploy-properties: |
+          deployAtEnd=true
+      files: '**'
+      archive-artifacts: ''
+      build-node: 'ubuntu1804-docker-8c-8g'
+
+- project:
+      name: dcaegen2-platform-ves-openapi-sonar
+      java-version: openjdk11
+      jobs:
+          - gerrit-maven-sonar
+      sonarcloud: true
+      sonarcloud-project-organization: '{sonarcloud_project_organization}'
+      sonarcloud-api-token: '{sonarcloud_api_token}'
+      sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+      sonar-mvn-goal: '{sonar_mvn_goal}'
+      cron: '@daily'
+      build-node: ubuntu1804-docker-8c-8g
+      project: 'dcaegen2/platform/ves-openapi-manager'
+      project-name: 'dcaegen2-platform-ves-openapi-manager'
+      branch: 'master'
+      mvn-settings: 'dcaegen2-platform-ves-openapi-manager-settings'
+      mvn-goals: 'clean install'
+      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+
 - project:
     name: dcaegen2-platform-ves-openapi-manager-project-view
     project-name: dcaegen2-platform-ves-openapi-manager

diff --git a/jjb/integration/integration-templates-csit.yaml b/jjb/integration/integration-templates-csit.yaml
index fea8402..f039447 100644 (file)
--- a/jjb/integration/integration-templates-csit.yaml
+++ b/jjb/integration/integration-templates-csit.yaml
@@ -42,7 +42,7 @@
           server: '{server-name}'
           project: 'integration/csit'
           branch: '{branch}'
-          files: '**/{project-name}/**'
+          files: '*/{project-name}/**'
 
     builders:
       - lf-update-java-alternatives:
@@ -105,7 +105,7 @@
           server: '{server-name}'
           project: 'integration/csit'
           branch: '{branch}'
-          files: '**/{project-name}/**'
+          files: '*/{project-name}/**'
       - timed: '@daily'
       - reverse:
           jobs: '{obj:trigger_jobs}'

diff --git a/jjb/integration/integration-terraform.yaml b/jjb/integration/integration-terraform.yaml
index 2a7fc5d..252e2d3 100644 (file)
--- a/jjb/integration/integration-terraform.yaml
+++ b/jjb/integration/integration-terraform.yaml
@@ -8,20 +8,33 @@
       - gerrit-info-yaml-verify
 
 - project:
-    name: integration-terraform-validate
+    name: integration-terraform-linters
     project: integration/terraform
     project-name: integration-terraform
+    python-version: python3
     jobs:
-        - integration-terraform-verify
+      - integration-linters
     subproject:
-        - 'openlab':
-              tox-dir: 'openlab'
-              tox-envs: 'terraform'
-              pattern: 'openlab/**'
-        - 'terragrunt':
-              tox-dir: 'terragrunt'
-              tox-envs: 'terragrunt'
-              pattern: 'terragrunt/**'
+      - 'yaml':
+          tox-dir: '.'
+          tox-envs: 'yaml'
+          pattern: '**/*.yaml'
+      - 'yml':
+          tox-dir: '.'
+          tox-envs: 'yaml'
+          pattern: '**/*.yml'
+      - 'json':
+          tox-dir: '.'
+          tox-envs: 'json'
+          pattern: '**/*.json'
+      - 'python':
+          tox-dir: '.'
+          tox-envs: 'py'
+          pattern: '**/*.py'
+      - 'md':
+          tox-dir: '.'
+          tox-envs: 'md'
+          pattern: '**/*.md'
     stream:
-        - 'master':
-              branch: 'master'
+      - 'master':
+          branch: 'master'