Merge "Automation adds oom-consul.yaml"

diff --git a/jjb/aaf/aaf-cadi.yaml b/jjb/aaf/aaf-cadi.yaml
index 64b3bc3..d8417ba 100644 (file)
--- a/jjb/aaf/aaf-cadi.yaml
+++ b/jjb/aaf/aaf-cadi.yaml
@@ -6,6 +6,8 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
       - gerrit-maven-stage:
           sign-artifacts: true
           build-node: centos7-docker-8c-8g

diff --git a/jjb/ccsdk/ccsdk-oran.yaml b/jjb/ccsdk/ccsdk-oran.yaml
index e80ecb1..ac15e76 100644 (file)
--- a/jjb/ccsdk/ccsdk-oran.yaml
+++ b/jjb/ccsdk/ccsdk-oran.yaml
@@ -24,6 +24,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'guilin':
+          branch: 'guilin'
     java-version: openjdk11
     mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-oran-settings'

diff --git a/jjb/ccsdk/cds.yaml b/jjb/ccsdk/cds.yaml
index 54dbe98..ed2276b 100644 (file)
--- a/jjb/ccsdk/cds.yaml
+++ b/jjb/ccsdk/cds.yaml
@@ -3,16 +3,16 @@
     name: ccsdk-cds
     project-name: 'ccsdk-cds'
     jobs:
-      - gerrit-maven-verify
+      - gerrit-maven-verify:
+          mvn-opts: '-Ddocker.skip.push=true'
       - gerrit-maven-merge:
           cron: '@daily'
       - gerrit-maven-stage:
           build-node: centos7-builder-4c-4g
           sign-artifacts: true
-          maven-versions-plugin: true
+          mvn-opts: '-Ddocker.skip=true'
           cron: ''
       - 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-params: '-Dmaven.test.skip=true -P docker'
@@ -41,7 +41,9 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1804-builder-4c-4g
+    docker-pom: 'pom.xml'
+    mvn-profile: docker
+    build-node: ubuntu1804-docker-8c-8g
     mvn-snapshot-id: 'ecomp-snapshots'
     nexus-snapshot-repo: 'snapshots'
 
@@ -82,7 +84,6 @@
     mvn-settings: 'ccsdk-cds-settings'
     build-node: ubuntu1804-builder-4c-4g
 
-
 - project:
     name: ccsdk-cds-info
     project-name: ccsdk-cds

diff --git a/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml b/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml
index 221e0f5..f6859a3 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml
@@ -23,8 +23,10 @@
       # build docker image
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
-      - gerrit-release-verify
-      - gerrit-release-merge
+      - gerrit-release-verify:
+          build-node: centos7-docker-8c-8g
+      - gerrit-release-merge:
+          build-node: centos7-docker-8c-8g
     stream:
       - master:
           branch: master

diff --git a/jjb/dcaegen2/dcaegen2-services-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-mapper.yaml
index cde857b..ab9bb54 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-services-mapper.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-mapper.yaml
@@ -12,7 +12,7 @@
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
           build-node: ubuntu1804-docker-8c-8g
-          mvn-goals: 'clean package docker:build -DpushImage'
+          mvn-goals: 'clean package docker:build -DpushImageTag'
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
       - '{project-name}-gerrit-release-jobs':

diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml
index da5dfdc..55df274 100644 (file)
--- a/jjb/global-templates-java.yaml
+++ b/jjb/global-templates-java.yaml
@@ -1090,6 +1090,8 @@
 
     builders:
       - lf-infra-pre-build
+      - lf-update-java-alternatives:
+          java-version: "{java-version}"
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'

diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index 89e83c2..a6d3695 100644 (file)
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -39,6 +39,14 @@
           default: '{terraform-version}'
           description: 'Terraform version to install on minion'
 
+- parameter:
+    name: integration-terragrunt-version
+    parameters:
+      - string:
+          name: TERRAGRUNT_VERSION
+          default: '{terragrunt-version}'
+          description: 'Terragrunt version to install on minion'
+
 - builder:
     name: integration-install-robotframework
     builders:
@@ -88,6 +96,18 @@
          sudo mv terraform /usr/local/bin/
          terraform version
 
+- builder:
+   name: integration-install-terragrunt
+   builders:
+     - shell: |
+         #!/bin/bash
+         set -ex
+         cd /tmp
+         wget -q https://github.com/gruntwork-io/terragrunt/releases/download/v${TERRAGRUNT_VERSION}/terragrunt_linux_amd64
+         sudo mv terragrunt_linux_amd64 /usr/local/bin/terragrunt
+         sudo chmod +x /usr/local/bin/terragrunt
+         terragrunt --version
+
 - builder:
     name: integration-docker-compose-logs
     builders:

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 42c0697..77be42b 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -109,6 +109,7 @@
     <<: *tox_verify_boilerplate
     name: '{project-name}-{stream}-{subproject}-terraform-verify'
     terraform-version: 0.13.2
+    terragrunt-version: 0.24.1
     python-version: python3
     id: integration-terraform-verify
     description: 'Job intended for validating terraform modules'
@@ -123,9 +124,12 @@
           tox-envs: '{tox-envs}'
       - integration-terraform-version:
           terraform-version: '{terraform-version}'
+      - integration-terragrunt-version:
+          terragrunt-version: '{terragrunt-version}'
 
     builders:
       - integration-install-terraform
+      - integration-install-terragrunt
       - lf-infra-tox-install:
           python-version: '{python-version}'
       - lf-infra-tox-run:

diff --git a/jjb/integration/integration-terraform.yaml b/jjb/integration/integration-terraform.yaml
index 015f420..2a7fc5d 100644 (file)
--- a/jjb/integration/integration-terraform.yaml
+++ b/jjb/integration/integration-terraform.yaml
@@ -17,7 +17,11 @@
         - 'openlab':
               tox-dir: 'openlab'
               tox-envs: 'terraform'
-              pattern: '**/*'
+              pattern: 'openlab/**'
+        - 'terragrunt':
+              tox-dir: 'terragrunt'
+              tox-envs: 'terragrunt'
+              pattern: 'terragrunt/**'
     stream:
         - 'master':
               branch: 'master'

diff --git a/jjb/multicloud/multicloud-azure-java.yaml b/jjb/multicloud/multicloud-azure-java.yaml
index da9827b..ff30754 100644 (file)
--- a/jjb/multicloud/multicloud-azure-java.yaml
+++ b/jjb/multicloud/multicloud-azure-java.yaml
@@ -10,7 +10,7 @@
     subproject:
       - 'azure':
           pom: 'azure/pom.xml'
-          pattern: 'azure/**'
+          pattern: 'azure/azure/**'
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'

diff --git a/jjb/multicloud/multicloud-info.yaml b/jjb/multicloud/multicloud-info.yaml
new file mode 100644 (file)
index 0000000..d3b5dde
--- /dev/null
+++ b/jjb/multicloud/multicloud-info.yaml
@@ -0,0 +1,29 @@
+---
+
+- project:
+    name: multicloud-info
+    project-name: multicloud
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
+    project: multicloud
+    branch: master
+
+- project:
+    name: multicloud-windriver-info
+    project-name: multicloud-windriver
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
+    project: multicloud/openstack/windriver
+    branch: master
+
+- project:
+    name: multicloud-oom-info
+    project-name: multicloud-oom
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
+    project: multicloud/oom
+    branch: master
+

diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml
index 22fa481..c64d17e 100644 (file)
--- a/jjb/sdc/sdc.yaml
+++ b/jjb/sdc/sdc.yaml
@@ -35,7 +35,6 @@
           docker-pom: 'pom.xml'
           mvn-profile: 'docker'
           mvn-params: '-Dnpm.registry=https://nexus3.onap.org/repository/npm.public/'
-          java-version: openjdk11
       - gerrit-maven-stage:
           build-timeout: 90
           sign-artifacts: true