summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-v1-8c-8g.cfg3
-rw-r--r--jjb/dcaegen2/dcaegen2-pmmapper-csit.yaml13
-rw-r--r--jjb/policy/policy-apex-pdp.yaml2
-rw-r--r--jjb/policy/policy-common.yaml2
-rw-r--r--jjb/policy/policy-distribution.yaml2
-rw-r--r--jjb/policy/policy-drools-applications.yaml2
-rw-r--r--jjb/policy/policy-drools-pdp.yaml2
-rw-r--r--jjb/policy/policy-engine.yaml2
-rw-r--r--jjb/sdc/sdc-sdc-docker-base.yaml2
-rw-r--r--jjb/sdc/sdc.yaml1
-rw-r--r--jjb/vid/vid-csit.yaml26
-rw-r--r--jjb/vid/vid.yaml32
-rw-r--r--jjb/vnfrqts/build-and-upload.yaml50
-rw-r--r--jjb/vnfrqts/build-needs.sh7
-rw-r--r--jjb/vnfrqts/vnfrqts-requirements.yaml12
-rw-r--r--jjb/vvp/build-csv.sh8
-rw-r--r--jjb/vvp/vvp-validation-scripts.yaml12
17 files changed, 143 insertions, 35 deletions
diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-v1-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-v1-8c-8g.cfg
new file mode 100644
index 000000000..5b7d179f6
--- /dev/null
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-v1-8c-8g.cfg
@@ -0,0 +1,3 @@
+IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - x86_64 - 20180903-000118.904
+LABELS=ubuntu1604-docker-8c-8g
+HARDWARE_ID=v1-standard-4
diff --git a/jjb/dcaegen2/dcaegen2-pmmapper-csit.yaml b/jjb/dcaegen2/dcaegen2-pmmapper-csit.yaml
new file mode 100644
index 000000000..38216d1e8
--- /dev/null
+++ b/jjb/dcaegen2/dcaegen2-pmmapper-csit.yaml
@@ -0,0 +1,13 @@
+- project:
+ name: dcae-bulkpm-csit
+ jobs:
+ - '{project-name}-{stream}-verify-csit-{functionality}'
+ - '{project-name}-{stream}-csit-{functionality}'
+ project-name: 'dcaegen2-pmmapper'
+ stream: 'master'
+ functionality:
+ - 'pmmapper':
+ trigger_jobs:
+ - '{project-name}-{stream}-docker-java-shell-daily'
+ robot-options: ''
+ branch: 'master'
diff --git a/jjb/policy/policy-apex-pdp.yaml b/jjb/policy/policy-apex-pdp.yaml
index aa5d49bc8..1fba9abf7 100644
--- a/jjb/policy/policy-apex-pdp.yaml
+++ b/jjb/policy/policy-apex-pdp.yaml
@@ -48,7 +48,7 @@
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
script:
!include-raw-escape: 'include-raw-docker-release.sh'
- disabled: false
+ disabled: true
build-node: ubuntu1604-docker-8c-8g
project: 'policy/apex-pdp'
stream:
diff --git a/jjb/policy/policy-common.yaml b/jjb/policy/policy-common.yaml
index d81fb7e96..d4e80b993 100644
--- a/jjb/policy/policy-common.yaml
+++ b/jjb/policy/policy-common.yaml
@@ -24,7 +24,7 @@
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily':
- disabled: false
+ disabled: true
project: 'policy/common'
stream:
diff --git a/jjb/policy/policy-distribution.yaml b/jjb/policy/policy-distribution.yaml
index 6c529c89a..c2ad0f723 100644
--- a/jjb/policy/policy-distribution.yaml
+++ b/jjb/policy/policy-distribution.yaml
@@ -37,7 +37,7 @@
docker-pom: 'pom.xml'
mvn-profile: 'docker'
mvn-params: '-Dmaven.test.skip=true'
- disabled: false
+ disabled: true
build-node: ubuntu1604-docker-8c-8g
project: 'policy/distribution'
diff --git a/jjb/policy/policy-drools-applications.yaml b/jjb/policy/policy-drools-applications.yaml
index 7661e5079..ba8a08fd2 100644
--- a/jjb/policy/policy-drools-applications.yaml
+++ b/jjb/policy/policy-drools-applications.yaml
@@ -24,7 +24,7 @@
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily':
- disabled: false
+ disabled: true
project: 'policy/drools-applications'
stream:
diff --git a/jjb/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml
index 5e34e7791..367783742 100644
--- a/jjb/policy/policy-drools-pdp.yaml
+++ b/jjb/policy/policy-drools-pdp.yaml
@@ -42,7 +42,7 @@
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
script:
!include-raw-escape: 'include-raw-docker-release.sh'
- disabled: false
+ disabled: true
build-node: ubuntu1604-docker-8c-8g
project: 'policy/drools-pdp'
stream:
diff --git a/jjb/policy/policy-engine.yaml b/jjb/policy/policy-engine.yaml
index a52553818..70d9c3a9f 100644
--- a/jjb/policy/policy-engine.yaml
+++ b/jjb/policy/policy-engine.yaml
@@ -42,7 +42,7 @@
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
script:
!include-raw-escape: 'include-raw-docker-release.sh'
- disabled: false
+ disabled: true
build-node: ubuntu1604-docker-8c-8g
project: 'policy/engine'
stream:
diff --git a/jjb/sdc/sdc-sdc-docker-base.yaml b/jjb/sdc/sdc-sdc-docker-base.yaml
index 3560a5f85..c372f8ab4 100644
--- a/jjb/sdc/sdc-sdc-docker-base.yaml
+++ b/jjb/sdc/sdc-sdc-docker-base.yaml
@@ -5,6 +5,7 @@
project-name: 'sdc-sdc-docker-base'
jobs:
- '{project-name}-{stream}-sdc-merge-java':
+ build-node: 'ubuntu1604-docker-8c-8g'
docker-pom: 'pom.xml'
mvn-profile: 'default'
project: 'sdc/sdc-docker-base'
@@ -24,6 +25,7 @@
project-name: 'sdc-sdc-docker-base-arm64'
jobs:
- '{project-name}-{stream}-sdc-merge-java':
+ build-node: 'ubuntu1604-docker-8c-8g'
docker-pom: 'pom.xml'
mvn-profile: 'default'
project: 'sdc/sdc-docker-base'
diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml
index cfdaad2f5..f3d3f68d3 100644
--- a/jjb/sdc/sdc.yaml
+++ b/jjb/sdc/sdc.yaml
@@ -30,6 +30,7 @@
- '{project-name}-{stream}-verify-java':
mvn-params: '-Dnpm.registry=https://nexus.onap.org/content/repositories/npm/'
- '{project-name}-{stream}-sdc-merge-java':
+ build-node: 'ubuntu1604-docker-8c-8g'
docker-pom: 'pom.xml'
mvn-profile: 'docker'
mvn-params: '-Dnpm.registry=https://nexus.onap.org/content/repositories/npm/'
diff --git a/jjb/vid/vid-csit.yaml b/jjb/vid/vid-csit.yaml
index 04d653676..c4643e565 100644
--- a/jjb/vid/vid-csit.yaml
+++ b/jjb/vid/vid-csit.yaml
@@ -15,16 +15,16 @@
trigger_jobs: '{project-name}-{stream}-docker-version-java-daily'
robot-options: ''
-- project:
- name: vid-csit-arm64
- jobs:
- - '{project-name}-arm64-{stream}-verify-csit-{functionality}'
- - '{project-name}-arm64-{stream}-csit-{functionality}'
- project-name: 'vid'
- stream:
- - 'master':
- branch: 'master'
- functionality:
- - 'healthCheck':
- trigger_jobs: '{project-name}-{stream}-docker-version-java-daily'
- robot-options: ''
+#- project:
+# name: vid-csit-arm64
+# jobs:
+# - '{project-name}-arm64-{stream}-verify-csit-{functionality}'
+# - '{project-name}-arm64-{stream}-csit-{functionality}'
+# project-name: 'vid'
+# stream:
+# - 'master':
+# branch: 'master'
+# functionality:
+# - 'healthCheck':
+# trigger_jobs: '{project-name}-{stream}-docker-version-java-daily'
+# robot-options: ''
diff --git a/jjb/vid/vid.yaml b/jjb/vid/vid.yaml
index 54a680e1e..b10a71795 100644
--- a/jjb/vid/vid.yaml
+++ b/jjb/vid/vid.yaml
@@ -42,22 +42,22 @@
archive-artifacts: ''
build-node: queue-docker-4c-4g
-- project:
- name: vid-docker-arm64
- project-name: 'vid-arm64'
- jobs:
- - 'docker-version-java-daily':
- docker-pom: 'pom.xml'
- mvn-profile: 'docker'
- project: 'vid'
- stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'vid-settings'
- files: '**'
- archive-artifacts: ''
- build-node: ubuntu1604-docker-arm64-4c-2g
-
+#- project:
+# name: vid-docker-arm64
+# project-name: 'vid-arm64'
+# jobs:
+# - 'docker-version-java-daily':
+# docker-pom: 'pom.xml'
+# mvn-profile: 'docker'
+# project: 'vid'
+# stream:
+# - 'master':
+# branch: 'master'
+# mvn-settings: 'vid-settings'
+# files: '**'
+# archive-artifacts: ''
+# build-node: ubuntu1604-docker-arm64-4c-2g
+#
- project:
name: vid-sonar
jobs:
diff --git a/jjb/vnfrqts/build-and-upload.yaml b/jjb/vnfrqts/build-and-upload.yaml
new file mode 100644
index 000000000..b97fd468a
--- /dev/null
+++ b/jjb/vnfrqts/build-and-upload.yaml
@@ -0,0 +1,50 @@
+---
+- job-template:
+ # Job template for running a script to build an artifact and
+ # upload it to nexus as RAW artifacts.
+ #
+
+ name: '{project-name}-{stream}-build-and-upload'
+
+ project-type: freestyle
+ concurrent: true
+ node: '{build-node}'
+
+ properties:
+ - infra-properties:
+ build-days-to-keep: '{build-days-to-keep}'
+
+ parameters:
+ - infra-parameters:
+ project: '{project}'
+ branch: '{branch}'
+ refspec: 'refs/heads/{branch}'
+ artifacts: '{archive-artifacts}'
+
+ scm:
+ - git:
+ credentials-id: '{jenkins-ssh-credential}'
+ url: '$GIT_BASE'
+ refspec: ''
+ choosing-strategy: 'default'
+ branches:
+ - 'refs/heads/{branch}'
+ skip-tag: true
+ wipe-workspace: true
+ submodule:
+ recursive: '{submodule-recursive}'
+ timeout: '24'
+
+ wrappers:
+ - infra-wrappers:
+ build-timeout: '{build-timeout}'
+
+ triggers:
+ - timed: 'H H * * *'
+
+ builders:
+ - shell: '{script}'
+
+ publishers:
+ - infra-shiplogs:
+ maven-version: '{maven-version}'
diff --git a/jjb/vnfrqts/build-needs.sh b/jjb/vnfrqts/build-needs.sh
new file mode 100644
index 000000000..85de18bfa
--- /dev/null
+++ b/jjb/vnfrqts/build-needs.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+virtualenv $WORKSPACE/venv-tox
+source $WORKSPACE/venv-tox/bin/activate
+pip install --upgrade pip
+pip install -r etc/requirements.txt
+ls
+tox -e docs \ No newline at end of file
diff --git a/jjb/vnfrqts/vnfrqts-requirements.yaml b/jjb/vnfrqts/vnfrqts-requirements.yaml
index e62095f83..9d1a483af 100644
--- a/jjb/vnfrqts/vnfrqts-requirements.yaml
+++ b/jjb/vnfrqts/vnfrqts-requirements.yaml
@@ -7,3 +7,15 @@
project-name: 'vnfrqts-requirements'
branch: 'master'
mvn-settings: 'vnfrqts-requirements-settings'
+
+- project:
+ name: vnfrqts-requirements-upload-json
+ project: 'vnfrqts/requirements'
+ project-name: 'vnfrqts-requirements'
+ stream:
+ - 'master':
+ branch: 'master'
+ jobs:
+ - '{project-name}-{stream}-build-and-upload':
+ script:
+ !include-raw-escape: 'build-needs.sh'
diff --git a/jjb/vvp/build-csv.sh b/jjb/vvp/build-csv.sh
new file mode 100644
index 000000000..7c379128b
--- /dev/null
+++ b/jjb/vvp/build-csv.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+virtualenv -p python3 $WORKSPACE/venv-tox
+source $WORKSPACE/venv-tox/bin/activate
+pip3 install --upgrade pip
+pip3 install --no-use-pep517 -r requirements.txt
+ls
+cd ice_validator/
+pytest --self-test tests/
diff --git a/jjb/vvp/vvp-validation-scripts.yaml b/jjb/vvp/vvp-validation-scripts.yaml
index 94861bd75..71fc7109a 100644
--- a/jjb/vvp/vvp-validation-scripts.yaml
+++ b/jjb/vvp/vvp-validation-scripts.yaml
@@ -32,3 +32,15 @@
mvn-settings: 'vvp-validation-scripts-settings'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+ name: vvp-validation-scripts-tracability-matrix
+ project: 'vvp/validation-scripts'
+ project-name: 'vvp-validation-scripts'
+ stream:
+ - 'master':
+ branch: 'master'
+ jobs:
+ - '{project-name}-{stream}-build-and-upload':
+ script:
+ !include-raw-escape: 'build-csv.sh'