summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--jjb/ccsdk/apps.yaml1
-rw-r--r--jjb/integration/integration-templates-csit.yaml8
-rw-r--r--jjb/portal-sdk/portal-sdk.yaml2
-rw-r--r--jjb/so/so-csit.yaml6
-rw-r--r--jjb/testsuite/testsuite-cds.yaml32
-rw-r--r--jjb/vid/vid-csit.yaml2
6 files changed, 41 insertions, 10 deletions
diff --git a/jjb/ccsdk/apps.yaml b/jjb/ccsdk/apps.yaml
index 088325835..1397a65cc 100644
--- a/jjb/ccsdk/apps.yaml
+++ b/jjb/ccsdk/apps.yaml
@@ -21,6 +21,7 @@
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
mvn-params: '-Dmaven.test.skip=true -P docker'
+ maven-versions-plugin: true
cron: '@daily'
- '{project-name}-gerrit-release-jobs':
build-node: centos7-docker-8c-8g
diff --git a/jjb/integration/integration-templates-csit.yaml b/jjb/integration/integration-templates-csit.yaml
index 40a6a93ff..b6568ae98 100644
--- a/jjb/integration/integration-templates-csit.yaml
+++ b/jjb/integration/integration-templates-csit.yaml
@@ -125,7 +125,7 @@
- job-template:
name: '{project-name}-{stream}-verify-csit-{functionality}-testng'
- disabled: false
+ disabled: '{disabled}'
project-type: freestyle
build-node: 'ubuntu1804-docker-8c-8g'
@@ -209,7 +209,7 @@
- job-template:
name: '{project-name}-arm64-{stream}-verify-csit-{functionality}-testng'
- disabled: false
+ disabled: '{disabled}'
project-type: freestyle
build-node: 'ubuntu1804-docker-arm64-4c-2g'
@@ -423,7 +423,7 @@
- job-template:
name: '{project-name}-{stream}-csit-{functionality}-testng'
- disabled: false
+ disabled: '{disabled}'
project-type: freestyle
build-node: 'ubuntu1804-docker-8c-8g'
@@ -510,7 +510,7 @@
- job-template:
name: '{project-name}-arm64-{stream}-csit-{functionality}-testng'
- disabled: false
+ disabled: '{disabled}'
project-type: freestyle
build-node: 'ubuntu1804-docker-arm64-4c-2g'
diff --git a/jjb/portal-sdk/portal-sdk.yaml b/jjb/portal-sdk/portal-sdk.yaml
index 32c9333c5..a4d46a569 100644
--- a/jjb/portal-sdk/portal-sdk.yaml
+++ b/jjb/portal-sdk/portal-sdk.yaml
@@ -14,7 +14,7 @@
build-node: centos7-builder-4c-4g
maven-versions-plugin: true
mvn-pom: 'ecomp-sdk/pom.xml'
- mvn-params: '-f ecomp-sdk/pom.xml'
+ mvn-params: '-f ecomp-sdk/pom.xml -Dskiptests=true'
pattern: 'ecomp-sdk/**'
- '{project-name}-{stream}-{subproject}-verify-java'
- '{project-name}-{stream}-{subproject}-merge-java'
diff --git a/jjb/so/so-csit.yaml b/jjb/so/so-csit.yaml
index ca4d1a346..722120786 100644
--- a/jjb/so/so-csit.yaml
+++ b/jjb/so/so-csit.yaml
@@ -10,13 +10,11 @@
stream:
- 'master':
branch: 'master'
- - 'elalto':
- branch: 'elalto'
- 'frankfurt':
branch: 'frankfurt'
functionality:
- 'integration-testing':
- trigger_jobs: '{project-name}-{stream}-docker-version-java-daily'
+ trigger_jobs:
- 'integration-etsi-testing':
- trigger_jobs: '{project-name}-{stream}-docker-version-java-daily'
+ trigger_jobs:
robot-options: ''
diff --git a/jjb/testsuite/testsuite-cds.yaml b/jjb/testsuite/testsuite-cds.yaml
index 50a1558f3..2fef96a11 100644
--- a/jjb/testsuite/testsuite-cds.yaml
+++ b/jjb/testsuite/testsuite-cds.yaml
@@ -6,3 +6,35 @@
build-node: centos7-builder-2c-1g
jobs:
- gerrit-info-yaml-verify
+
+- project:
+ name: testsuite-cds-linters
+ project: 'testsuite/cds'
+ project-name: 'testsuite-cds'
+ python-version: python3
+ jobs:
+ - integration-linters
+ subproject:
+ - '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'
diff --git a/jjb/vid/vid-csit.yaml b/jjb/vid/vid-csit.yaml
index 6f734e5fc..193189abc 100644
--- a/jjb/vid/vid-csit.yaml
+++ b/jjb/vid/vid-csit.yaml
@@ -11,7 +11,7 @@
branch: 'master'
functionality:
- 'healthCheck':
- trigger_jobs: '{project-name}-{stream}-docker-version-java-daily'
+ trigger_jobs:
robot-options: ''
#- project: