ONAP CPS: performance test job - updates
Change-Id: I158802c7cd9d064edf0c1ab9351014a56528a122
diff --git a/jjb/global/jjb-macros.yaml b/jjb/global/jjb-macros.yaml
index f8c46cb..c1c6abe 100644
--- a/jjb/global/jjb-macros.yaml
+++ b/jjb/global/jjb-macros.yaml
@@ -29,39 +29,6 @@
default: ssh://$GERRIT_USER@gerrit.nordix.org:29418
description: HTTPS URL of Project Repo on Nordix Gerrit to clone repo
-# Those parameters are used for ONAP java build jobs in Nordix environment.
-- parameter:
- name: nordix-onap-java-build-parameters
- parameters:
- - string:
- name: JAVA_HOME
- default: '/usr/lib/jvm/{jdk-version}-openjdk-amd64'
- description: Java home
- - string:
- name: MVN_VERSION
- default: '{mvn_version}'
- description: Maven version
- - string:
- name: MVN_URL
- default: https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/$MVN_VERSION/apache-maven-${{MVN_VERSION}}-bin.zip
- description: URL to download Maven
- - string:
- name: MVN
- default: $WORKSPACE/apache-maven-${{MVN_VERSION}}/bin/mvn
- description: Path to mvn executable
- - string:
- name: MVN_SETTINGS_XML_VERSION
- default: '{mvn_settings_xml_version}'
- description: Commit ID of ONAP Oparent repository (https://git.onap.org/oparent/) to pull. Used for Maven settings file. Can be left blank to pull the latest version.
- - string:
- name: MVN_PARAMS
- default: '{mvn_params}'
- description: Maven build parameters
- - string:
- name: SUBDIRECTORY
- default: '{subdirectory}'
- description: Subdirectory of the workspace for which the pom.xml will be called. This allows the verify to be called against a specific directory
-
- parameter:
name: onap-gerrit-parameters
parameters:
diff --git a/jjb/onap/cps/cps-performance-test-jobs.yaml b/jjb/onap/cps/cps-performance-test-jobs.yaml
index 42dc03f..d08f4f8 100644
--- a/jjb/onap/cps/cps-performance-test-jobs.yaml
+++ b/jjb/onap/cps/cps-performance-test-jobs.yaml
@@ -33,4 +33,4 @@
jdk-version: java-11
jobs:
- - 'onap-{project-name}-{stream}-time-trigger-java'
+ - 'onap-{project-name}-{stream}-performance-test-java'
diff --git a/jjb/onap/cps/cps-verify-jobs.yaml b/jjb/onap/cps/cps-verify-jobs.yaml
index 13bcb0e..a193dd0 100644
--- a/jjb/onap/cps/cps-verify-jobs.yaml
+++ b/jjb/onap/cps/cps-verify-jobs.yaml
@@ -24,7 +24,6 @@
name: cps-verify
project: cps
project-name: cps
- mvn_params: "-P include-performance"
stream:
- 'master':
diff --git a/jjb/onap/global-templates-onap-java.yaml b/jjb/onap/global-templates-onap-java.yaml
index a3b881c..e5d2f84 100644
--- a/jjb/onap/global-templates-onap-java.yaml
+++ b/jjb/onap/global-templates-onap-java.yaml
@@ -17,7 +17,34 @@
project: 'onap/{project}'
branch: '{branch}'
- nordix-gerrit-parameters
- - nordix-onap-java-build-parameters
+ - string:
+ name: JAVA_HOME
+ default: '/usr/lib/jvm/{jdk-version}-openjdk-amd64'
+ description: Java home
+ - string:
+ name: MVN_VERSION
+ default: '{mvn_version}'
+ description: Maven version
+ - string:
+ name: MVN_URL
+ default: https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/$MVN_VERSION/apache-maven-${{MVN_VERSION}}-bin.zip
+ description: URL to download Maven
+ - string:
+ name: MVN
+ default: $WORKSPACE/apache-maven-${{MVN_VERSION}}/bin/mvn
+ description: Path to mvn executable
+ - string:
+ name: MVN_SETTINGS_XML_VERSION
+ default: '{mvn_settings_xml_version}'
+ description: Commit ID of ONAP Oparent repository (https://git.onap.org/oparent/) to pull. Used for Maven settings file. Can be left blank to pull the latest version.
+ - string:
+ name: MVN_PARAMS
+ default: '{mvn_params}'
+ description: Maven build parameters
+ - string:
+ name: SUBDIRECTORY
+ default: '{subdirectory}'
+ description: Subdirectory of the workspace for which the pom.xml will be called. This allows the verify to be called against a specific directory
scm:
- git-scm-gerrit:
@@ -42,7 +69,7 @@
!include-raw-escape: ./verify-jobs.sh
- job-template:
- name: 'onap-{project-name}-{stream}-time-trigger-java'
+ name: 'onap-{project-name}-{stream}-performance-test-java'
disabled_job_var: false
node: onap-ubuntu1804
@@ -60,13 +87,39 @@
project: 'onap/{project}'
branch: '{branch}'
- nordix-gerrit-parameters
- - nordix-onap-java-build-parameters
-
+ - string:
+ name: JAVA_HOME
+ default: '/usr/lib/jvm/{jdk-version}-openjdk-amd64'
+ description: Java home
+ - string:
+ name: MVN_VERSION
+ default: '{mvn_version}'
+ description: Maven version
+ - string:
+ name: MVN_URL
+ default: https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/$MVN_VERSION/apache-maven-${{MVN_VERSION}}-bin.zip
+ description: URL to download Maven
+ - string:
+ name: MVN
+ default: $WORKSPACE/apache-maven-${{MVN_VERSION}}/bin/mvn
+ description: Path to mvn executable
+ - string:
+ name: MVN_SETTINGS_XML_VERSION
+ default: '{mvn_settings_xml_version}'
+ description: Commit ID of ONAP Oparent repository (https://git.onap.org/oparent/) to pull. Used for Maven settings file. Can be left blank to pull the latest version.
+ - string:
+ name: MVN_PARAMS
+ default: '{mvn_params}'
+ description: Maven build parameters
+ - string:
+ name: SUBDIRECTORY
+ default: '{subdirectory}'
+ description: Subdirectory of the workspace for which the pom.xml will be called. This allows the verify to be called against a specific directory
scm:
- git-scm-gerrit:
ssh-credentials-id: nordixinfra-nordix-gerrit-ssh
branch: '{branch}'
- refspec: $GERRIT_REFSPEC
+ refspec: ''
wipe_workspace: true
clean_before: false