From: M.Hosnidokht <mohammad.hosnidokht@yoppworks.com>
Date: Tue, 11 May 2021 00:10:53 +0000 (-0400)
Subject: Replace jenkins verify/merge jobs build node with the one contains docker
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=c43d93f5877619af548443f9cbcc164c28f546d3;p=ci-management.git

Replace jenkins verify/merge jobs build node with the one contains docker

Current jenkins verify/merge jobs do need docker to run tests, but
integration tests with testcontainer (https://gerrit.onap.org/r/c/aai/resources/+/121142)
need docker to run successfully.

Issue-ID: AAI-3324
Signed-off-by: Mohammad Hosnidokht <mohammad.hosnidokht@yoppworks.com>
Change-Id: I9d5162e12676505637232bc8f1cf5d03aae77ee4
---

diff --git a/jjb/aai/aai-resources.yaml b/jjb/aai/aai-resources.yaml
index b53b378cd..77d07a380 100644
--- a/jjb/aai/aai-resources.yaml
+++ b/jjb/aai/aai-resources.yaml
@@ -9,9 +9,12 @@
     name: aai-resources
     project-name: 'aai-resources'
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-verify-java':
+          build-node: ubuntu1804-docker-8c-8g
+      - '{project-name}-{stream}-merge-java':
+          build-node: ubuntu1804-docker-8c-8g
       - gerrit-maven-stage:
+          mvn-params: '-DskipTests'
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
@@ -44,7 +47,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1804-builder-4c-4g
+    build-node: ubuntu1804-docker-8c-8g
     project: 'aai/resources'
     project-name: 'aai-resources'
     branch: 'master'