From: afenner Date: Wed, 12 Jul 2023 08:17:45 +0000 (+0100) Subject: update policy verify to include csit X-Git-Url: https://gerrit.nordix.org/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F02%2F18802%2F1;p=infra%2Fcicd.git update policy verify to include csit just for policy clamp for now Change-Id: I0400337eab7e52628b88738dd753a626335ed6b5 Signed-off-by: afenner --- diff --git a/jjb/onap/global-templates-onap-java.yaml b/jjb/onap/global-templates-onap-java.yaml index 439038bc..8902f57a 100644 --- a/jjb/onap/global-templates-onap-java.yaml +++ b/jjb/onap/global-templates-onap-java.yaml @@ -68,6 +68,82 @@ - shell: !include-raw-escape: ./verify-jobs.sh +# A job to perform CSIT on policy components +- job-template: + name: 'onap-{project-name}-{stream}-policy-csit-verify-java' + disabled_job_var: false + node: onap-ubuntu1804 + + disabled: '{obj:disabled_job_var}' + concurrent: true + mvn_settings_xml_version: + mvn_params: + mvn_version: 3.5.4 + subdirectory: + properties: + - logrotate + + parameters: + - project-parameters: + project: 'onap/{project}' + branch: '{branch}' + - nordix-gerrit-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: CSIT_NAME + default: '{csit-name}' + description: The name of the csit-test to run + - 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 + wipe_workspace: true + clean_before: false + + triggers: + - nordix-gerrit-trigger-patchset-created: + project: 'onap/{project}' + branch: '{branch}' + files: '**' + + wrappers: + - build-timeout: + timeout: 45 + + builders: + - shell: + !include-raw-escape: ./verify-jobs.sh + - shell: + !include-raw-escape: ./verify-policy-csit.sh - job-template: name: 'onap-{project-name}-{stream}-performance-test-java' disabled_job_var: false @@ -148,6 +224,7 @@ - shell: !include-raw-escape: ./verify-jobs.sh + # csits for diferent projects are different so need to have special handling - job-template: name: 'onap-policy-docker-{stream}-csit-java' diff --git a/jjb/onap/policy-clamp/policy-clamp-verify-jobs.yaml b/jjb/onap/policy-clamp/policy-clamp-verify-jobs.yaml index ca0ebdc1..dec6f1f6 100644 --- a/jjb/onap/policy-clamp/policy-clamp-verify-jobs.yaml +++ b/jjb/onap/policy-clamp/policy-clamp-verify-jobs.yaml @@ -25,7 +25,8 @@ name: policy-clamp-verify project: policy/clamp project-name: policy-clamp - + csit-name: clamp + mvn_params: "-Pdocker" stream: - 'master': branch: '{stream}' @@ -37,4 +38,4 @@ branch: '{stream}' jdk-version: java-11 jobs: - - 'onap-{project-name}-{stream}-verify-java' + - 'onap-{project-name}-{stream}-policy-csit-verify-java' diff --git a/jjb/onap/verify-policy-csit.sh b/jjb/onap/verify-policy-csit.sh new file mode 100755 index 00000000..f7a8635f --- /dev/null +++ b/jjb/onap/verify-policy-csit.sh @@ -0,0 +1,14 @@ +#!/bin/bash +set -o errexit +set -o nounset +set -o pipefail + +cd $WORKSPACE +echo "Info: Clone policy docker to get acces to csit execution" +git clone "https://gerrit.nordix.org/onap/policy/docker" csitdocker +cd csitdocker +echo "check what images are available" +docker images +export WORKSPACE=$PWD +echo "run the tests for $CSIT_NAME" +csit/run-k8s-csit.sh install $CSIT_NAME true