Merge "CI: Remove deprecated arm64 nodes"
diff --git a/.editorconfig b/.editorconfig
index 5eb4e67..8700277 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -21,5 +21,5 @@
max_line_length = 80
[*.yaml]
-indent_size = 4
-
+indent_size = 2
+max_line_length = 120
diff --git a/.github/workflows/gerrit-verify.yaml b/.github/workflows/gerrit-verify.yaml
new file mode 100644
index 0000000..ea754d8
--- /dev/null
+++ b/.github/workflows/gerrit-verify.yaml
@@ -0,0 +1,142 @@
+---
+name: Gerrit Verify
+
+# yamllint disable-line rule:truthy
+on:
+ workflow_dispatch:
+ inputs:
+ GERRIT_BRANCH:
+ description: "Branch that change is against"
+ required: true
+ type: string
+ GERRIT_CHANGE_ID:
+ description: "The ID for the change"
+ required: true
+ type: string
+ GERRIT_CHANGE_NUMBER:
+ description: "The Gerrit number"
+ required: true
+ type: string
+ GERRIT_CHANGE_URL:
+ description: "URL to the change"
+ required: true
+ type: string
+ GERRIT_EVENT_TYPE:
+ description: "Type of Gerrit event"
+ required: true
+ type: string
+ GERRIT_PATCHSET_NUMBER:
+ description: "The patch number for the change"
+ required: true
+ type: string
+ GERRIT_PATCHSET_REVISION:
+ description: "The revision sha"
+ required: true
+ type: string
+ GERRIT_PROJECT:
+ description: "Project in Gerrit"
+ required: true
+ type: string
+ GERRIT_REFSPEC:
+ description: "Gerrit refspec of change"
+ required: true
+ type: string
+
+concurrency:
+ group: ${{ github.event.inputs.GERRIT_CHANGE_ID || github.run_id }}
+ cancel-in-progress: true
+
+jobs:
+ prepare:
+ runs-on: ubuntu-latest
+ steps:
+ - name: Clear votes
+ uses: lfit/gerrit-review-action@v0.3
+ with:
+ host: ${{ vars.GERRIT_SERVER }}
+ username: ${{ vars.GERRIT_SSH_USER }}
+ key: ${{ secrets.GERRIT_SSH_PRIVKEY }}
+ known_hosts: ${{ vars.GERRIT_KNOWN_HOSTS }}
+ gerrit-change-number: ${{ inputs.GERRIT_CHANGE_NUMBER }}
+ gerrit-patchset-number: ${{ inputs.GERRIT_PATCHSET_NUMBER }}
+ vote-type: clear
+ - name: Allow replication
+ run: sleep 10s
+
+ actionlint:
+ needs: prepare
+ runs-on: ubuntu-latest
+ steps:
+ - uses: lfit/checkout-gerrit-change-action@v0.3
+ with:
+ gerrit-refspec: ${{ inputs.GERRIT_REFSPEC }}
+ delay: "0s"
+ - name: Download actionlint
+ id: get_actionlint
+ run: bash <(curl https://raw.githubusercontent.com/rhysd/actionlint/main/scripts/download-actionlint.bash)
+ shell: bash
+ - name: Check workflow files
+ run: ${{ steps.get_actionlint.outputs.executable }} -color
+ shell: bash
+
+ # run pre-commit tox env separately to get use of more parallel processing
+ pre-commit:
+ needs: prepare
+ runs-on: ubuntu-latest
+ steps:
+ - uses: lfit/checkout-gerrit-change-action@v0.3
+ with:
+ gerrit-refspec: ${{ inputs.GERRIT_REFSPEC }}
+ delay: "0s"
+ - uses: actions/setup-python@v4
+ with:
+ python-version: "3.11"
+ - name: Run static analysis and format checkers
+ run: pipx run pre-commit run --all-files --show-diff-on-failure
+
+ jjb-validation:
+ needs: prepare
+ runs-on: ubuntu-latest
+ steps:
+ - uses: lfit/checkout-gerrit-change-action@v0.3
+ with:
+ gerrit-refspec: ${{ inputs.GERRIT_REFSPEC }}
+ delay: "0s"
+ - uses: actions/setup-python@v4
+ id: setup-python
+ with:
+ python-version: "3.11"
+ - name: Clone git submodules
+ run: git submodule update --init
+ - name: Run JJB Verify
+ run: |
+ python -m pip install --upgrade pip
+ pip install jenkins-job-builder
+ mkdir -p "${HOME}/.config/jenkins_jobs"
+ cat << EOF > "${HOME}/.config/jenkins_jobs/jenkins_jobs.ini"
+ [job_builder]
+ ignore_cache=True
+ keep_descriptions=False
+ include_path=.
+ recursive=True
+ query_plugins_info=False
+ config-xml=True
+ EOF
+ jenkins-jobs test -o archives/job-configs jjb/
+
+ vote:
+ if: ${{ always() }}
+ needs: [prepare, actionlint, pre-commit, jjb-validation]
+ runs-on: ubuntu-latest
+ steps:
+ - uses: technote-space/workflow-conclusion-action@v3
+ - name: Set vote
+ uses: lfit/gerrit-review-action@v0.3
+ with:
+ host: ${{ vars.GERRIT_SERVER }}
+ username: ${{ vars.GERRIT_SSH_USER }}
+ key: ${{ secrets.GERRIT_SSH_PRIVKEY }}
+ known_hosts: ${{ vars.GERRIT_KNOWN_HOSTS }}
+ gerrit-change-number: ${{ inputs.GERRIT_CHANGE_NUMBER }}
+ gerrit-patchset-number: ${{ inputs.GERRIT_PATCHSET_NUMBER }}
+ vote-type: ${{ env.WORKFLOW_CONCLUSION }}
diff --git a/.gitlint b/.gitlint
new file mode 100644
index 0000000..8d37da1
--- /dev/null
+++ b/.gitlint
@@ -0,0 +1,97 @@
+# All these sections are optional, edit this file as you like.
+[general]
+# Ignore certain rules, you can reference them by their id or by their full
+# name
+# ignore=title-trailing-punctuation, T3
+
+# verbosity should be a value between 1 and 3, the command line -v flags take
+# precedence over this
+# verbosity = 2
+
+# By default gitlint will ignore merge commits. Set to 'false' to disable.
+# ignore-merge-commits=true
+
+# By default gitlint will ignore fixup commits. Set to 'false' to disable.
+# ignore-fixup-commits=true
+
+# By default gitlint will ignore squash commits. Set to 'false' to disable.
+# ignore-squash-commits=true
+
+# Enable debug mode (prints more output). Disabled by default.
+# debug=true
+
+# Set the extra-path where gitlint will search for user defined rules
+# See http://jorisroovers.github.io/gitlint/user_defined_rules for details
+# extra-path=examples/
+
+# contrib=contrib-title-conventional-commits,contrib-body-requires-signed-off-by
+contrib=contrib-body-requires-signed-off-by
+
+# [title-max-length]
+# line-length=80
+
+# [title-must-not-contain-word]
+# Comma-separated list of words that should not occur in the title. Matching is
+# case insensitive. It's fine if the keyword occurs as part of a larger word
+# (so "WIPING" will not cause a violation, but "WIP: my title" will.
+# words=wip
+
+# [title-match-regex]
+# python like regex (https://docs.python.org/2/library/re.html) that the
+# commit-msg title must be matched to.
+# Note that the regex can contradict with other rules if not used correctly
+# (e.g. title-must-not-contain-word).
+# regex=^US[0-9]*
+
+# [B1]
+# B1 = body-max-line-length
+# line-length=120
+
+# [body-min-length]
+# min-length=5
+
+# [body-is-missing]
+# Whether to ignore this rule on merge commits (which typically only have a title)
+# default = True
+# ignore-merge-commits=false
+
+# [body-changed-file-mention]
+# List of files that need to be explicitly mentioned in the body when they are
+# changed This is useful for when developers often erroneously edit certain
+# files or git submodules. By specifying this rule, developers can only change
+# the file when they explicitly reference it in the commit message.
+# files=gitlint/rules.py,README.md
+
+# [author-valid-email]
+# python like regex (https://docs.python.org/2/library/re.html) that the
+# commit author email address should be matched to
+# For example, use the following regex if you only want to allow email
+# addresses from foo.com
+# regex=[^@]+@foo.com
+
+# [ignore-by-title]
+# Ignore certain rules for commits of which the title matches a regex
+# E.g. Match commit titles that start with "Release"
+# regex=^Release(.*)
+#
+# Ignore certain rules, you can reference them by their id or by their full name
+# Use 'all' to ignore all rules
+# ignore=T1,body-min-length
+
+# [ignore-by-body]
+# Ignore certain rules for commits of which the body has a line that matches a
+# regex
+# E.g. Match bodies that have a line that contain "release"
+# regex=(.*)release(.*)
+#
+# Ignore certain rules, you can reference them by their id or by their full name
+# Use 'all' to ignore all rules
+# ignore=T1,body-min-length
+
+# Enable Conventional Commit subject line enforcement
+# https://www.conventionalcommits.org/en/v1.0.0/
+#
+# Since we want all subjects to be well formed, enforce the topics
+# to the following (fairly standard) topics and require them to be Mixed Case
+# [contrib-title-conventional-commits]
+# types=Fix,Feat,Chore,Docs,Style,Refactor,Perf,Test,Revert,CI,Build
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
new file mode 100644
index 0000000..ca94141
--- /dev/null
+++ b/.pre-commit-config.yaml
@@ -0,0 +1,32 @@
+---
+repos:
+ - repo: https://github.com/pre-commit/pre-commit-hooks
+ rev: v4.4.0
+ hooks:
+ - id: trailing-whitespace
+ - id: check-executables-have-shebangs
+ stages: [manual]
+ - id: check-json
+ exclude: (.vscode|.devcontainer)
+ - id: no-commit-to-branch
+ args:
+ - --branch=dev
+ - --branch=master
+ - --branch=main
+ - --branch=rc
+
+ - repo: https://github.com/jorisroovers/gitlint
+ rev: v0.19.1
+ hooks:
+ - id: gitlint
+
+ - repo: https://github.com/adrienverge/yamllint.git
+ rev: v1.31.0
+ hooks:
+ - id: yamllint
+
+ - repo: https://github.com/pre-commit/mirrors-prettier
+ rev: v3.0.0-alpha.9-for-vscode
+ hooks:
+ - id: prettier
+ stages: [commit]
diff --git a/.yamllint b/.yamllint
new file mode 100644
index 0000000..d4497f8
--- /dev/null
+++ b/.yamllint
@@ -0,0 +1,11 @@
+---
+extends: default
+
+rules:
+ empty-lines:
+ max-end: 1
+ line-length:
+ max: 120
+ comments:
+ # prettier forces 1 space comment separator
+ min-spaces-from-content: 1
diff --git a/INFO.yaml b/INFO.yaml
index bf38e97..245abbe 100644
--- a/INFO.yaml
+++ b/INFO.yaml
@@ -1,70 +1,85 @@
---
-project: 'ci-management'
-project_creation_date: '2017-01-24'
-lifecycle_state: 'Incubation'
-project_category: ''
+project: "ci-management"
+project_creation_date: "2017-01-24"
+lifecycle_state: "Incubation"
+project_category: ""
project_lead: &onap_releng_ptl
- name: 'Jessica Wagantall'
- email: 'jwagantall@linuxfoundation.org'
- id: 'jwagantall'
- company: 'LF'
- timezone: 'America/Los_Angeles'
+ name: "Jessica Wagantall"
+ email: "jwagantall@linuxfoundation.org"
+ id: "jwagantall"
+ company: "LF"
+ timezone: "America/Los_Angeles"
primary_contact: *onap_releng_ptl
issue_tracking:
- type: 'jira'
- url: 'https://jira.onap.org/projects/CIMAN'
- key: 'CIMAN'
+ type: "jira"
+ url: "https://jira.onap.org/projects/CIMAN"
+ key: "CIMAN"
mailing_list:
- type: 'groups.io'
- url: 'lists.onap.org'
- tag: '<[sub-project_name]>'
-realtime_discussion: ''
+ type: "groups.io"
+ url: "lists.onap.org"
+ tag: "<[sub-project_name]>"
+realtime_discussion: ""
meetings:
- - type: 'zoom'
- agenda: 'n/a'
- url: 'n/a'
- server: 'n/a'
- channel: 'n/a'
- repeats: 'n/a'
- time: 'n/a'
+ - type: "zoom"
+ agenda: "n/a"
+ url: "n/a"
+ server: "n/a"
+ channel: "n/a"
+ repeats: "n/a"
+ time: "n/a"
repositories:
- - ci-management
+ - ci-management
committers:
- - <<: *onap_releng_ptl
- - name: 'Bengt Thuree'
- email: 'bthuree@linuxfoundation.org'
- company: 'LF'
- id: 'bthuree'
- timezone: 'Australia/Melbourne'
- - name: 'Andrew Grimberg'
- email: 'agrimberg@linuxfoundation.org'
- company: 'LF'
- id: 'agrimberg'
- timezone: 'America/Los_Angeles'
- - name: 'Eric Ball'
- email: 'eball@linuxfoundation.org'
- company: 'LF'
- id: 'eball'
- timezone: 'America/Los_Angeles'
- - name: 'Morgan Richomme'
- email: 'morgan.richomme@orange.com'
- company: 'orange'
- id: 'mrichomme'
- timezone: 'France/Paris'
- - name: 'Bartek Grzybowski'
- email: 'b.grzybowski@partner.samsung.com'
- company: 'samsung'
- id: 'bgrzybowski'
- timezone: 'Poland/Warsaw'
- - name: 'Lasse Kaihlavirta'
- email: 'l.kaihlavirt@partner.samsung.com'
- company: 'samsung'
- id: 'kaihlavi'
- timezone: 'Europe/Helsinki'
- - name: 'Kevin Sandi'
- email: 'ksandi@contractor.linuxfoundation.org'
- company: 'LF'
- id: 'kevin.sandi'
- timezone: 'America/Costa_Rica'
+ - <<: *onap_releng_ptl
+ - name: "Bengt Thuree"
+ email: "bthuree@linuxfoundation.org"
+ company: "LF"
+ id: "bthuree"
+ timezone: "Australia/Melbourne"
+ - name: "Andrew Grimberg"
+ email: "agrimberg@linuxfoundation.org"
+ company: "LF"
+ id: "agrimberg"
+ timezone: "America/Los_Angeles"
+ - name: "Eric Ball"
+ email: "eball@linuxfoundation.org"
+ company: "LF"
+ id: "eball"
+ timezone: "America/Los_Angeles"
+ - name: "Morgan Richomme"
+ email: "morgan.richomme@orange.com"
+ company: "orange"
+ id: "mrichomme"
+ timezone: "France/Paris"
+ - name: "Bartek Grzybowski"
+ email: "b.grzybowski@partner.samsung.com"
+ company: "samsung"
+ id: "bgrzybowski"
+ timezone: "Poland/Warsaw"
+ - name: "Lasse Kaihlavirta"
+ email: "l.kaihlavirt@partner.samsung.com"
+ company: "samsung"
+ id: "kaihlavi"
+ timezone: "Europe/Helsinki"
+ - name: "Kevin Sandi"
+ email: "ksandi@contractor.linuxfoundation.org"
+ company: "LF"
+ id: "kevin.sandi"
+ timezone: "America/Costa_Rica"
+ - name: "Matt Watkins"
+ email: "mwatkins@linuxfoundation.org"
+ company: "LF"
+ id: "modeSevenindustrialsolutions"
+ timezone: "Europe/London"
+ - name: "Thomas Kulik"
+ email: "thomas.kulik@telekom.de"
+ company: "Deutsche Telekom"
+ id: "thmsdt"
+ timezone: "Germany/Berlin"
+ - name: "Cédric Ollivier"
+ email: "cedric.ollivier@orange.com"
+ company: "Orange"
+ id: "ollivier"
+ timezone: "Europe/Paris"
tsc:
- approval: 'https://lists.onap.org/pipermail/onap-tsc'
+ approval: "https://lists.onap.org/pipermail/onap-tsc"
diff --git a/Sandbox_Setup.md b/Sandbox_Setup.md
index 8904105..f7101c6 100644
--- a/Sandbox_Setup.md
+++ b/Sandbox_Setup.md
@@ -1,4 +1,4 @@
-## ONAP Jenkins Sandbox Process:
+# ONAP Jenkins Sandbox Process
ONAP Jenkins Sandbox provides you Jenkins Job testing/experimentation environment
that can be used before pushing job templates to the production
@@ -23,23 +23,40 @@
Jenkins configurations to Sandbox environment, you must raise a ticket to
[Linux Foundation Help Center](https://support.linuxfoundation.org)
+- [ONAP Jenkins Sandbox Process](#onap-jenkins-sandbox-process)
+ - [Setup](#setup)
+ - [Install JJB on your machine](#install-jjb-on-your-machine)
+ - [Make a copy of the example JJB config file (in the ci-management/ directory)](#make-a-copy-of-the-example-jjb-config-file-in-the-ci-management-directory)
+ - [Retrieve username and API token](#retrieve-username-and-api-token)
+ - [Working with jobs](#working-with-jobs)
+ - [Test a Job](#test-a-job)
+ - [Update a job](#update-a-job)
+ - [Trigger jobs from Jenkins Sandbox](#trigger-jobs-from-jenkins-sandbox)
+ - [Delete a Job](#delete-a-job)
+ - [Modify an Existing Job](#modify-an-existing-job)
+ - [More online documentation](#more-online-documentation)
+
+## Setup
+
To download **ci-management**, execute the following command to clone the
**ci-management** repository.
-`git clone https://gerrit.onap.org/r/ci-management && (cd ci-management && curl -Lo \
+```sh
+git clone https://gerrit.onap.org/r/ci-management && (cd ci-management && curl -Lo \
$(git rev-parse --git-dir)/hooks/commit-msg https://gerrit.onap.org/r/tools/hooks/commit-msg; \
-chmod +x $(git rev-parse --git-dir)/hooks/commit-msg)`
+chmod +x $(git rev-parse --git-dir)/hooks/commit-msg)
+```
Make sure to sync global-jjb submodule using:
`git submodule update --init`
-Once you successfully clone the repository, next step is to install JJB
+Once you successfully cloned the repository, next step is to install JJB
(Jenkins Job Builder) in order to experiment with Jenkins jobs.
-### Execute the following commands to install JJB on your machine:
+### Install JJB on your machine
-```
+```sh
cd ci-management
pip install virtualenv
virtualenv onap_sandbox
@@ -51,15 +68,17 @@
### Make a copy of the example JJB config file (in the ci-management/ directory)
-Backup the jenkins.ini.example to jenkins.ini
+Place a copy of the `jenkins.ini.example` file as `jenkins.ini` in your home folder:
-`mkdir -p ~/.config/jenkins_jobs`
-`cp jenkins.ini.example ~/.config/jenkins_jobs/jenkins_jobs.ini`
-
-After copying the jenkins.ini.example, modify `jenkins.ini` with your
-**Jenkins LFID username** and **API token**
-
+```sh
+mkdir -p ~/.config/jenkins_jobs
+cp jenkins.ini.example ~/.config/jenkins_jobs/jenkins_jobs.ini
```
+
+Modify the resulting `~/.config/jenkins_jobs/jenkins_jobs.ini` with your
+**Jenkins LFID username** and **API token**. Make sure that your account has the necessary permissions (request them via the [LFN help desk](https://jira.linuxfoundation.org/plugins/servlet/desk/portal/2/create/35) if not)!
+
+```ini
[job_builder]
ignore_cache=True
keep_descriptions=False
@@ -73,23 +92,29 @@
url=https://jenkins.onap.org/sandbox
query_plugins_info=False
```
-### How to retrieve username and API token?
+
+### Retrieve username and API token
+
Login to the [Jenkins Sandbox](https://jenkins.onap.org/sandbox/), go to your user
page by clicking on your username - `Jenkins User ID` on this page is your Jenkins
Sandbox username. Click **Configure** and then click **Add new Token**.
After that specify a token name (optional) and click on **Generate** to generate and show
new token. Please note down your token and store it securely.
+## Working with jobs
+
To work on existing jobs or create new jobs, navigate to the `ci-management/jjb/` directory where you
-will find all job templates for the project. Follow the below commands to test,
+will find all job templates for the project. Follow the below commands to test,
update or delete jobs in your sandbox environment.
-## To Test a Job:
+### Test a Job
After you modify or create jobs in the above environment, it's good practice
-to test the job in sandbox environment before you submit this job to production CI environment.
+to test the job in the sandbox environment before you submit this job to the production CI environment.
-`jenkins-jobs test jjb/ <job-name>`
+```sh
+jenkins-jobs test jjb/ <job-name>
+```
**Example:** `jenkins-jobs test jjb/ sdc-master-verify-java`
@@ -102,24 +127,28 @@
Execute the following command to pipe-out to a directory:
-`jenkins-jobs test jjb/ <job-name> -o <directoryname>`
+```sh
+jenkins-jobs test jjb/ <job-name> -o <directoryname>
+```
The output directory will contain files with the XML configurations.
-## To Update a job:
+### Update a job
Ensure you’ve configured your `jenkins_jobs.ini` and verified the changes by
outputting valid XML descriptions of the relevant Jenkins jobs. Upon successful
verification, execute the following command to update the job to the Jenkins sandbox.
-`jenkins-jobs update jjb/ <job-name>`
+```sh
+jenkins-jobs update jjb/ <job-name>
+```
**Example:** `jenkins-jobs update jjb/ sdc-master-verify-java`
-## Trigger jobs from Jenkins Sandbox:
+### Trigger jobs from Jenkins Sandbox
Once you push the Jenkins job configuration to the ONAP Sandbox environment,
-run the job from Jenkins Sandbox webUI. Follow the below process to trigger the build:
+run the job from the Jenkins Sandbox webUI. Follow the below process to trigger the build:
Step 1: Login into the [Jenkins Sandbox WebUI](https://jenkins.onap.org/sandbox/)
@@ -133,26 +162,28 @@
Once the job is triggered, click on the build number to view the job
details and the console output.
-## To Delete a Job:
+### Delete a Job
Execute the following command to Delete a job from Sandbox:
-`jenkins-jobs delete jjb/ <job-name>`
+```sh
+jenkins-jobs delete jjb/ <job-name>
+```
**Example:** `jenkins-jobs delete jjb/ sdc-master-verify-java`
The above command would delete the `sdc-master-verify-java` job.
-## Modify an Existing Job:
+### Modify an Existing Job
In the ONAP Jenkins sandbox, you can directly edit or modify the job configuration
by selecting the job name and clicking on the **Configure** button. Then, click the
**Apply** and **Save** buttons to save the job.
However, it is recommended to simply modify the job in your terminal and then follow
-the previously described steps in **To Test a Job** and **To Update a Job** to perform
+the previously described steps in [Test a Job](#test-a-job) and [Update a Job](#update-a-job) to perform
your modifications.
-## More online documentation:
+## More online documentation
https://docs.openstack.org/infra/jenkins-job-builder/
diff --git a/global-jjb b/global-jjb
index 3c627cc..9fab4a0 160000
--- a/global-jjb
+++ b/global-jjb
@@ -1 +1 @@
-Subproject commit 3c627ccf046b02f12767aa45d9ac4bf515352f2f
+Subproject commit 9fab4a0c544f801dd07ac78f67375ddee67e76fc
diff --git a/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-1g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-1g.cfg
deleted file mode 100644
index 38f914e..0000000
--- a/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-1g.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20220919-201945.234
-LABELS=centos7-builder-2c-1g
-HARDWARE_ID=v3-standard-2
diff --git a/jenkins-config/clouds/openstack/cattle/centos7-builder-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-builder-4c-4g.cfg
deleted file mode 100644
index a2cdcaa..0000000
--- a/jenkins-config/clouds/openstack/cattle/centos7-builder-4c-4g.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20220919-201945.234
-LABELS=centos7-builder-4c-4g
-HARDWARE_ID=v3-standard-4
diff --git a/jenkins-config/clouds/openstack/cattle/centos7-docker-2c-1g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-docker-2c-1g.cfg
new file mode 100644
index 0000000..9a09672
--- /dev/null
+++ b/jenkins-config/clouds/openstack/cattle/centos7-docker-2c-1g.cfg
@@ -0,0 +1,3 @@
+IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20220919-201912.261
+LABELS=centos7-docker-2c-1g
+HARDWARE_ID=v3-standard-2
diff --git a/jenkins-config/clouds/openstack/cattle/centos7-docker-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-docker-8c-8g.cfg
deleted file mode 100644
index 4567d1e..0000000
--- a/jenkins-config/clouds/openstack/cattle/centos7-docker-8c-8g.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20220919-201912.261
-LABELS=centos7-docker-8c-8g
-HARDWARE_ID=v3-standard-8
diff --git a/jenkins-config/clouds/openstack/cattle/centos8-builder-2c-1g.cfg b/jenkins-config/clouds/openstack/cattle/centos8-builder-2c-1g.cfg
index 5e96729..bdb3ccb 100644
--- a/jenkins-config/clouds/openstack/cattle/centos8-builder-2c-1g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/centos8-builder-2c-1g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20221013-022318.551
+IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20230131-200810.126
LABELS=centos8-builder-2c-1g
HARDWARE_ID=v3-standard-2
diff --git a/jenkins-config/clouds/openstack/cattle/centos8-builder-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/centos8-builder-4c-4g.cfg
index 4bc1363..2bff0e7 100644
--- a/jenkins-config/clouds/openstack/cattle/centos8-builder-4c-4g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/centos8-builder-4c-4g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20221013-022318.551
+IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20230131-200810.126
LABELS=centos8-builder-4c-4g
HARDWARE_ID=v3-standard-4
diff --git a/jenkins-config/clouds/openstack/cattle/centos8-docker-2c-8g.cfg b/jenkins-config/clouds/openstack/cattle/centos8-docker-2c-8g.cfg
new file mode 100644
index 0000000..9e8361f
--- /dev/null
+++ b/jenkins-config/clouds/openstack/cattle/centos8-docker-2c-8g.cfg
@@ -0,0 +1,3 @@
+IMAGE_NAME=ZZCI - CentOS Stream 8 - docker - x86_64 - 20230215-011800.297
+LABELS=centos8-docker-2c-8g
+HARDWARE_ID=v3-standard-2
diff --git a/jenkins-config/clouds/openstack/cattle/centos8-docker-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/centos8-docker-4c-4g.cfg
new file mode 100644
index 0000000..d7d096c
--- /dev/null
+++ b/jenkins-config/clouds/openstack/cattle/centos8-docker-4c-4g.cfg
@@ -0,0 +1,3 @@
+IMAGE_NAME=ZZCI - CentOS Stream 8 - docker - x86_64 - 20230215-011800.297
+LABELS=centos8-docker-4c-4g
+HARDWARE_ID=v3-standard-4
diff --git a/jenkins-config/clouds/openstack/cattle/centos8-docker-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/centos8-docker-8c-8g.cfg
index b58f8dc..bebde4b 100644
--- a/jenkins-config/clouds/openstack/cattle/centos8-docker-8c-8g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/centos8-docker-8c-8g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - CentOS Stream 8 - docker - x86_64 - 20220912-171155.418
+IMAGE_NAME=ZZCI - CentOS Stream 8 - docker - x86_64 - 20230215-011800.297
LABELS=centos8-docker-8c-8g
HARDWARE_ID=v3-standard-8
diff --git a/jenkins-config/clouds/openstack/cattle/centos8-redis-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/centos8-redis-4c-4g.cfg
index 0c5f296..0076226 100644
--- a/jenkins-config/clouds/openstack/cattle/centos8-redis-4c-4g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/centos8-redis-4c-4g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=CentOS Stream 8 - redis - - 150980909-9011
+IMAGE_NAME=CentOS Stream 8 - redis - - 310180101-1010
LABELS=centos8-redis-4c-4g
HARDWARE_ID=v3-standard-4
diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-2c-1g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-2c-1g.cfg
deleted file mode 100644
index 2f7b62a..0000000
--- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-2c-1g.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-IMAGE_NAME=ZZCI - Ubuntu 18.04 - helm - x86_64 - 20220919-172402.717
-LABELS=ubuntu1804-helm-2c-1g
-HARDWARE_ID=v3-standard-4
diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu2004-builder-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu2004-builder-4c-4g.cfg
index 887d9a5..fab7f2f 100644
--- a/jenkins-config/clouds/openstack/cattle/ubuntu2004-builder-4c-4g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu2004-builder-4c-4g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - Ubuntu 20.04 - builder - x86_64 - 20221013-010346.073
+IMAGE_NAME=ZZCI - Ubuntu 20.04 - builder - x86_64 - 20230412-164405.694
LABELS=ubuntu2004-builder-4c-4g
HARDWARE_ID=v3-standard-4
diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu2004-docker-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu2004-docker-8c-8g.cfg
index c36ebcd..0a2e2e2 100644
--- a/jenkins-config/clouds/openstack/cattle/ubuntu2004-docker-8c-8g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu2004-docker-8c-8g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - Ubuntu 20.04 - docker - x86_64 - 20220919-201946.022
+IMAGE_NAME=ZZCI - Ubuntu 20.04 - docker - x86_64 - 20230414-200946.220
LABELS=ubuntu2004-docker-8c-8g
HARDWARE_ID=v3-standard-8
diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu2004-helm-2c-1g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu2004-helm-2c-1g.cfg
index a7eab68..ccef6ab 100644
--- a/jenkins-config/clouds/openstack/cattle/ubuntu2004-helm-2c-1g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu2004-helm-2c-1g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - Ubuntu 20.04 - helm - x86_64 - 20220907-184211.729
+IMAGE_NAME=ZZCI - Ubuntu 20.04 - helm - x86_64 - 20230405-210810.069
LABELS=ubuntu2004-helm-2c-1g
HARDWARE_ID=v3-standard-4
diff --git a/jenkins-config/managed-config-files/custom/lftoolsini/content b/jenkins-config/managed-config-files/custom/lftoolsini/content
index 43b872e..81755ba 100644
--- a/jenkins-config/managed-config-files/custom/lftoolsini/content
+++ b/jenkins-config/managed-config-files/custom/lftoolsini/content
@@ -1,9 +1,9 @@
-[nexus]
-username=$JENKINS_RELEASE_USR
-password=$JENKINS_RELEASE_PSW
[nexus.onap.org]
-username=$JENKINS_RELEASE_USR
+username=$LFTOOLSINI_NEXUS_USR
+password=$LFTOOLSINI_NEXUS_PSW
+[nexus]
+user=$JENKINS_RELEASE_USR
password=$JENKINS_RELEASE_PSW
[rtd]
-endpoint = https://readthedocs.org/api/v3/
-token = $RTD_TOKEN
+endpoint=https://readthedocs.org/api/v3/
+token=$RTD_TOKEN
diff --git a/jenkins-config/managed-config-files/custom/lftoolsini/customizedCredentialMappings.yaml b/jenkins-config/managed-config-files/custom/lftoolsini/customizedCredentialMappings.yaml
index be6f0a5..d237dbb 100644
--- a/jenkins-config/managed-config-files/custom/lftoolsini/customizedCredentialMappings.yaml
+++ b/jenkins-config/managed-config-files/custom/lftoolsini/customizedCredentialMappings.yaml
@@ -2,5 +2,7 @@
customizedCredentialMappings:
- credentialsId: "lftoolsini"
tokenKey: "JENKINS_RELEASE"
+ - credentialsId: "lftoolsini-nexus"
+ tokenKey: "LFTOOLSINI_NEXUS"
- credentialsId: "rtd-token"
tokenKey: "RTD_TOKEN"
diff --git a/jenkins-config/managed-config-files/custom/pypirc/content b/jenkins-config/managed-config-files/custom/pypirc/content
index 6a0fcdc..7103c83 100644
--- a/jenkins-config/managed-config-files/custom/pypirc/content
+++ b/jenkins-config/managed-config-files/custom/pypirc/content
@@ -29,3 +29,8 @@
repository: https://pypi.org/
username: __token__
password: $PYPI_TOKEN
+
+[pypi-onapsdk]
+repository: https://pypi.org/
+username: __token__
+password: $ONAP_PYPI_TOKEN
diff --git a/jenkins-config/managed-config-files/custom/pypirc/customizedCredentialMappings.yaml b/jenkins-config/managed-config-files/custom/pypirc/customizedCredentialMappings.yaml
index 894c65b..76a3e80 100644
--- a/jenkins-config/managed-config-files/custom/pypirc/customizedCredentialMappings.yaml
+++ b/jenkins-config/managed-config-files/custom/pypirc/customizedCredentialMappings.yaml
@@ -6,3 +6,5 @@
tokenKey: "PYPI_TOKEN"
- credentialsId: "pypi-test-token"
tokenKey: "PYPI_TEST_TOKEN"
+ - credentialsId: "onap-pypi-api-key"
+ tokenKey: "ONAP_PYPI_TOKEN"
diff --git a/jenkins-config/managed-config-files/mavenSettings/ccsdk-odl-legacy-settings/config-params.yaml b/jenkins-config/managed-config-files/mavenSettings/ccsdk-odl-legacy-settings/config-params.yaml
new file mode 100644
index 0000000..faa3f9a
--- /dev/null
+++ b/jenkins-config/managed-config-files/mavenSettings/ccsdk-odl-legacy-settings/config-params.yaml
@@ -0,0 +1,3 @@
+---
+name: "ccsdk-odl-legacy-settings"
+comment: "ccsdk-odl-legacy-settings"
diff --git a/jenkins-config/managed-config-files/mavenSettings/ccsdk-odl-legacy-settings/content b/jenkins-config/managed-config-files/mavenSettings/ccsdk-odl-legacy-settings/content
new file mode 120000
index 0000000..e830ebd
--- /dev/null
+++ b/jenkins-config/managed-config-files/mavenSettings/ccsdk-odl-legacy-settings/content
@@ -0,0 +1 @@
+../../../managed-config-templates/mavenSettings-content
\ No newline at end of file
diff --git a/jenkins-config/managed-config-files/mavenSettings/ccsdk-odl-legacy-settings/serverCredentialMappings.sandbox.yaml b/jenkins-config/managed-config-files/mavenSettings/ccsdk-odl-legacy-settings/serverCredentialMappings.sandbox.yaml
new file mode 120000
index 0000000..8f92057
--- /dev/null
+++ b/jenkins-config/managed-config-files/mavenSettings/ccsdk-odl-legacy-settings/serverCredentialMappings.sandbox.yaml
@@ -0,0 +1 @@
+../../../managed-config-templates/mavenSettings-serverCredentialMappings.sandbox.yaml
\ No newline at end of file
diff --git a/jenkins-config/managed-config-files/mavenSettings/ccsdk-odl-legacy-settings/serverCredentialMappings.yaml b/jenkins-config/managed-config-files/mavenSettings/ccsdk-odl-legacy-settings/serverCredentialMappings.yaml
new file mode 100644
index 0000000..602d5e4
--- /dev/null
+++ b/jenkins-config/managed-config-files/mavenSettings/ccsdk-odl-legacy-settings/serverCredentialMappings.yaml
@@ -0,0 +1,18 @@
+---
+serverCredentialMappings:
+ - serverId: "ecomp-snapshots"
+ credentialsId: &cred "ccsdk-odl-legacy"
+ - serverId: "ecomp-site"
+ credentialsId: *cred
+ - serverId: "ecomp-staging"
+ credentialsId: *cred
+ - serverId: "nexus3.onap.org:10001"
+ credentialsId: "read-only-docker"
+ - serverId: "nexus3.onap.org:10002"
+ credentialsId: *cred
+ - serverId: "nexus3.onap.org:10003"
+ credentialsId: *cred
+ - serverId: "nexus3.onap.org:10004"
+ credentialsId: *cred
+ - serverId: "docker.io"
+ credentialsId: "onap_dockerhub_creds"
diff --git a/jenkins-config/managed-config-files/mavenSettings/portal-ng-bff/config-params.yaml b/jenkins-config/managed-config-files/mavenSettings/portal-ng-bff/config-params.yaml
new file mode 100644
index 0000000..3a8e99e
--- /dev/null
+++ b/jenkins-config/managed-config-files/mavenSettings/portal-ng-bff/config-params.yaml
@@ -0,0 +1,3 @@
+---
+name: "portal-ng-bff"
+comment: "portal-ng-bff"
diff --git a/jenkins-config/managed-config-files/mavenSettings/portal-ng-bff/content b/jenkins-config/managed-config-files/mavenSettings/portal-ng-bff/content
new file mode 120000
index 0000000..e830ebd
--- /dev/null
+++ b/jenkins-config/managed-config-files/mavenSettings/portal-ng-bff/content
@@ -0,0 +1 @@
+../../../managed-config-templates/mavenSettings-content
\ No newline at end of file
diff --git a/jenkins-config/managed-config-files/mavenSettings/portal-ng-bff/serverCredentialMappings.sandbox.yaml b/jenkins-config/managed-config-files/mavenSettings/portal-ng-bff/serverCredentialMappings.sandbox.yaml
new file mode 120000
index 0000000..8f92057
--- /dev/null
+++ b/jenkins-config/managed-config-files/mavenSettings/portal-ng-bff/serverCredentialMappings.sandbox.yaml
@@ -0,0 +1 @@
+../../../managed-config-templates/mavenSettings-serverCredentialMappings.sandbox.yaml
\ No newline at end of file
diff --git a/jenkins-config/managed-config-files/mavenSettings/portal-ng-bff/serverCredentialMappings.yaml b/jenkins-config/managed-config-files/mavenSettings/portal-ng-bff/serverCredentialMappings.yaml
new file mode 100644
index 0000000..a164c28
--- /dev/null
+++ b/jenkins-config/managed-config-files/mavenSettings/portal-ng-bff/serverCredentialMappings.yaml
@@ -0,0 +1,18 @@
+---
+serverCredentialMappings:
+ - serverId: "ecomp-snapshots"
+ credentialsId: "portal-ng-bff"
+ - serverId: "ecomp-site"
+ credentialsId: "portal-ng-bff"
+ - serverId: "ecomp-staging"
+ credentialsId: "portal-ng-bff"
+ - serverId: "nexus3.onap.org:10001"
+ credentialsId: "portal-ng-bff"
+ - serverId: "nexus3.onap.org:10002"
+ credentialsId: "portal-ng-bff"
+ - serverId: "nexus3.onap.org:10003"
+ credentialsId: "portal-ng-bff"
+ - serverId: "nexus3.onap.org:10004"
+ credentialsId: "portal-ng-bff"
+ - serverId: "docker.io"
+ credentialsId: "onap_dockerhub_creds"
diff --git a/jenkins-config/managed-config-files/mavenSettings/portal-ng-history/config-params.yaml b/jenkins-config/managed-config-files/mavenSettings/portal-ng-history/config-params.yaml
new file mode 100644
index 0000000..597813b
--- /dev/null
+++ b/jenkins-config/managed-config-files/mavenSettings/portal-ng-history/config-params.yaml
@@ -0,0 +1,3 @@
+---
+name: "portal-ng-history"
+comment: "portal-ng-history"
diff --git a/jenkins-config/managed-config-files/mavenSettings/portal-ng-history/content b/jenkins-config/managed-config-files/mavenSettings/portal-ng-history/content
new file mode 120000
index 0000000..e830ebd
--- /dev/null
+++ b/jenkins-config/managed-config-files/mavenSettings/portal-ng-history/content
@@ -0,0 +1 @@
+../../../managed-config-templates/mavenSettings-content
\ No newline at end of file
diff --git a/jenkins-config/managed-config-files/mavenSettings/portal-ng-history/serverCredentialMappings.sandbox.yaml b/jenkins-config/managed-config-files/mavenSettings/portal-ng-history/serverCredentialMappings.sandbox.yaml
new file mode 120000
index 0000000..8f92057
--- /dev/null
+++ b/jenkins-config/managed-config-files/mavenSettings/portal-ng-history/serverCredentialMappings.sandbox.yaml
@@ -0,0 +1 @@
+../../../managed-config-templates/mavenSettings-serverCredentialMappings.sandbox.yaml
\ No newline at end of file
diff --git a/jenkins-config/managed-config-files/mavenSettings/portal-ng-history/serverCredentialMappings.yaml b/jenkins-config/managed-config-files/mavenSettings/portal-ng-history/serverCredentialMappings.yaml
new file mode 100644
index 0000000..db5f418
--- /dev/null
+++ b/jenkins-config/managed-config-files/mavenSettings/portal-ng-history/serverCredentialMappings.yaml
@@ -0,0 +1,18 @@
+---
+serverCredentialMappings:
+ - serverId: "ecomp-snapshots"
+ credentialsId: "portal-ng-history"
+ - serverId: "ecomp-site"
+ credentialsId: "portal-ng-history"
+ - serverId: "ecomp-staging"
+ credentialsId: "portal-ng-history"
+ - serverId: "nexus3.onap.org:10001"
+ credentialsId: "portal-ng-history"
+ - serverId: "nexus3.onap.org:10002"
+ credentialsId: "portal-ng-history"
+ - serverId: "nexus3.onap.org:10003"
+ credentialsId: "portal-ng-history"
+ - serverId: "nexus3.onap.org:10004"
+ credentialsId: "portal-ng-history"
+ - serverId: "docker.io"
+ credentialsId: "onap_dockerhub_creds"
diff --git a/jenkins-config/managed-config-files/mavenSettings/portal-ng-preferences/config-params.yaml b/jenkins-config/managed-config-files/mavenSettings/portal-ng-preferences/config-params.yaml
new file mode 100644
index 0000000..6acd7df
--- /dev/null
+++ b/jenkins-config/managed-config-files/mavenSettings/portal-ng-preferences/config-params.yaml
@@ -0,0 +1,3 @@
+---
+name: "portal-ng-preferences"
+comment: "portal-ng-preferences"
diff --git a/jenkins-config/managed-config-files/mavenSettings/portal-ng-preferences/content b/jenkins-config/managed-config-files/mavenSettings/portal-ng-preferences/content
new file mode 120000
index 0000000..e830ebd
--- /dev/null
+++ b/jenkins-config/managed-config-files/mavenSettings/portal-ng-preferences/content
@@ -0,0 +1 @@
+../../../managed-config-templates/mavenSettings-content
\ No newline at end of file
diff --git a/jenkins-config/managed-config-files/mavenSettings/portal-ng-preferences/serverCredentialMappings.sandbox.yaml b/jenkins-config/managed-config-files/mavenSettings/portal-ng-preferences/serverCredentialMappings.sandbox.yaml
new file mode 120000
index 0000000..8f92057
--- /dev/null
+++ b/jenkins-config/managed-config-files/mavenSettings/portal-ng-preferences/serverCredentialMappings.sandbox.yaml
@@ -0,0 +1 @@
+../../../managed-config-templates/mavenSettings-serverCredentialMappings.sandbox.yaml
\ No newline at end of file
diff --git a/jenkins-config/managed-config-files/mavenSettings/portal-ng-preferences/serverCredentialMappings.yaml b/jenkins-config/managed-config-files/mavenSettings/portal-ng-preferences/serverCredentialMappings.yaml
new file mode 100644
index 0000000..618ed2c
--- /dev/null
+++ b/jenkins-config/managed-config-files/mavenSettings/portal-ng-preferences/serverCredentialMappings.yaml
@@ -0,0 +1,18 @@
+---
+serverCredentialMappings:
+ - serverId: "ecomp-snapshots"
+ credentialsId: "portal-ng-preferences"
+ - serverId: "ecomp-site"
+ credentialsId: "portal-ng-preferences"
+ - serverId: "ecomp-staging"
+ credentialsId: "portal-ng-preferences"
+ - serverId: "nexus3.onap.org:10001"
+ credentialsId: "portal-ng-preferences"
+ - serverId: "nexus3.onap.org:10002"
+ credentialsId: "portal-ng-preferences"
+ - serverId: "nexus3.onap.org:10003"
+ credentialsId: "portal-ng-preferences"
+ - serverId: "nexus3.onap.org:10004"
+ credentialsId: "portal-ng-preferences"
+ - serverId: "docker.io"
+ credentialsId: "onap_dockerhub_creds"
diff --git a/jjb/aai/aai-aai-common.yaml b/jjb/aai/aai-aai-common.yaml
index 0327ce2..a068a44 100644
--- a/jjb/aai/aai-aai-common.yaml
+++ b/jjb/aai/aai-aai-common.yaml
@@ -7,29 +7,32 @@
- project:
name: aai-aai-common-master
- project-name: 'aai-aai-common'
+ project-name: "aai-aai-common"
jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
+ - "{project-name}-{stream}-verify-java"
+ - "{project-name}-{stream}-merge-java"
- gerrit-maven-stage:
- sign-artifacts: true
- build-node: centos7-builder-4c-4g
- maven-versions-plugin: true
sbom-generator: true
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
- project: 'aai/aai-common'
+ sign-artifacts: true
+ build-node: centos8-docker-4c-4g
+ maven-versions-plugin: true
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
+ project: "aai/aai-common"
stream:
- - 'master':
- branch: 'master'
- mvn-params: '-P spring-boot-2-1'
- - 'kohn':
- branch: 'kohn'
- mvn-params: '-P spring-boot-2-1'
- mvn-settings: 'aai-aai-common-settings'
- mvn-version: 'mvn35'
- files: '**'
- archive-artifacts: ''
+ - "master":
+ branch: "master"
+ mvn-params: "-P spring-boot-2-1"
+ - "jakarta":
+ branch: "jakarta"
+ mvn-params: "-P spring-boot-2-1"
+ - "kohn":
+ branch: "kohn"
+ mvn-params: "-P spring-boot-2-1"
+ mvn-settings: "aai-aai-common-settings"
+ mvn-version: "mvn35"
+ files: "**"
+ archive-artifacts: ""
build-node: ubuntu1804-builder-4c-4g
java-version: openjdk8
@@ -38,36 +41,35 @@
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
build-node: ubuntu1804-builder-4c-4g
- project: 'aai/aai-common'
- project-name: 'aai-aai-common'
- branch: 'master'
- mvn-params: '-P spring-boot-2-1'
- mvn-settings: 'aai-aai-common-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
- mvn-version: 'mvn35'
+ project: "aai/aai-common"
+ project-name: "aai-aai-common"
+ branch: "master"
+ mvn-params: "-P spring-boot-2-1"
+ mvn-settings: "aai-aai-common-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
+ mvn-version: "mvn35"
java-version: openjdk8
- project:
name: aai-aai-common-clm
jobs:
- gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
+ nexus-iq-namespace: "onap-"
build-node: ubuntu1804-builder-4c-4g
- project: 'aai/aai-common'
- project-name: 'aai-aai-common'
+ project: "aai/aai-common"
+ project-name: "aai-aai-common"
stream:
- - 'master':
- branch: 'master'
- mvn-params: '-P spring-boot-2-1'
- mvn-settings: 'aai-aai-common-settings'
- mvn-version: 'mvn35'
+ - "master":
+ branch: "master"
+ mvn-params: "-P spring-boot-2-1"
+ mvn-settings: "aai-aai-common-settings"
+ mvn-version: "mvn35"
java-version: openjdk8
- project:
@@ -80,27 +82,36 @@
branch: master
- project:
- name: 'aai-aai-common-docker'
+ name: "aai-aai-common-docker"
jobs:
- - '{project-name}-{stream}-verify-docker'
- - '{project-name}-{stream}-merge-docker'
+ - "{project-name}-{stream}-verify-docker"
+ - "{project-name}-{stream}-merge-docker"
- gerrit-maven-docker-stage:
- mvn-params: '-P docker -Dmaven.test.skip=true'
+ sbom-generator: true
+ mvn-params: "-P docker -Dmaven.test.skip=true"
build-node: ubuntu1804-docker-8c-8g
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
- project-name: 'aai-aai-common'
- project: 'aai/aai-common'
+ container-public-registry: "nexus3.onap.org:10001"
+ container-staging-registry: "nexus3.onap.org:10003"
+ project-name: "aai-aai-common"
+ project: "aai/aai-common"
stream:
- - 'master':
- branch: 'master'
- distro: 'alpine'
- mvn-params: '-P spring-boot-2-1,docker'
- docker_name: 'onap/aai-common-{distro}'
- docker_build_args: '-f ./Dockerfile.{distro}'
- docker_root: '$WORKSPACE/Dockerfiles/aai-common/'
- mvn-settings: 'aai-aai-common-settings'
- mvn-version: 'mvn35'
- files: 'Dockerfiles/aai-common/**'
+ - "master":
+ branch: "master"
+ distro: "alpine"
+ mvn-params: "-P spring-boot-2-1,docker"
+ - "jakarta":
+ branch: "jakarta"
+ distro: "alpine"
+ mvn-params: "-P spring-boot-2-1,docker"
+ - "kohn":
+ branch: "kohn"
+ distro: "alpine"
+ mvn-params: "-P spring-boot-2-1,docker"
+ docker_name: "onap/aai-common-{distro}"
+ docker_build_args: "-f ./Dockerfile.{distro}"
+ docker_root: "$WORKSPACE/Dockerfiles/aai-common/"
+ mvn-settings: "aai-aai-common-settings"
+ mvn-version: "mvn35"
+ files: "Dockerfiles/aai-common/**"
build-node: ubuntu1804-docker-8c-8g
java-version: openjdk8
diff --git a/jjb/aai/aai-babel.yaml b/jjb/aai/aai-babel.yaml
index 3f01a46..b3b1876 100644
--- a/jjb/aai/aai-babel.yaml
+++ b/jjb/aai/aai-babel.yaml
@@ -7,73 +7,75 @@
- project:
name: aai-babel
- project-name: 'aai-babel'
+ project-name: "aai-babel"
jobs:
- gerrit-maven-verify
- gerrit-maven-merge:
- cron: '@daily'
+ cron: "@daily"
- gerrit-maven-stage:
sign-artifacts: true
- build-node: centos7-builder-4c-4g
+ build-node: centos8-docker-4c-4g
maven-versions-plugin: true
sbom-generator: true
- gerrit-maven-docker-stage:
- mvn-params: '-P docker -B -Dmaven.test.skip=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
+ sbom-generator: true
+ # yamllint disable-line rule:line-length
+ mvn-params: "-P docker -B -Dmaven.test.skip=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn"
build-node: ubuntu1804-docker-8c-8g
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
- project: 'aai/babel'
+ container-public-registry: "nexus3.onap.org:10001"
+ container-staging-registry: "nexus3.onap.org:10003"
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
+ project: "aai/babel"
stream:
- - 'kohn':
- branch: 'kohn'
- - 'master':
- branch: 'master'
- mvn-settings: 'aai-babel-settings'
- files: '**'
- archive-artifacts: ''
+ - "jakarta":
+ branch: "jakarta"
+ - "kohn":
+ branch: "kohn"
+ - "master":
+ branch: "master"
+ mvn-settings: "aai-babel-settings"
+ files: "**"
+ archive-artifacts: ""
build-node: ubuntu1804-builder-4c-4g
java-version: openjdk11
- mvn-version: 'mvn36'
- nexus-snapshot-repo: 'snapshots'
- mvn-snapshot-id: 'ecomp-snapshots'
+ mvn-version: "mvn36"
+ nexus-snapshot-repo: "snapshots"
+ mvn-snapshot-id: "ecomp-snapshots"
- project:
name: aai-babel-sonar
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
build-node: ubuntu1804-builder-4c-4g
- project: 'aai/babel'
- project-name: 'aai-babel'
- branch: 'master'
- mvn-settings: 'aai-babel-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ project: "aai/babel"
+ project-name: "aai-babel"
+ branch: "master"
+ mvn-settings: "aai-babel-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
java-version: openjdk11
- mvn-version: 'mvn36'
+ mvn-version: "mvn36"
- project:
name: aai-babel-clm
jobs:
- gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
- project: 'aai/babel'
- project-name: 'aai-babel'
+ nexus-iq-namespace: "onap-"
+ project: "aai/babel"
+ project-name: "aai-babel"
stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'aai-babel-settings'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ - "master":
+ branch: "master"
+ mvn-settings: "aai-babel-settings"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
java-version: openjdk11
- mvn-version: 'mvn36'
-
+ mvn-version: "mvn36"
- project:
name: aai-babel-info
diff --git a/jjb/aai/aai-graphadmin.yaml b/jjb/aai/aai-graphadmin.yaml
index a258cbb..14db9ca 100644
--- a/jjb/aai/aai-graphadmin.yaml
+++ b/jjb/aai/aai-graphadmin.yaml
@@ -7,32 +7,35 @@
- project:
name: aai-graphadmin-master
- project-name: 'aai-graphadmin'
+ project-name: "aai-graphadmin"
jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
+ - "{project-name}-{stream}-verify-java"
+ - "{project-name}-{stream}-merge-java"
- gerrit-maven-stage:
sign-artifacts: true
- build-node: centos7-builder-4c-4g
+ build-node: centos8-docker-4c-4g
maven-versions-plugin: true
sbom-generator: true
- gerrit-maven-docker-stage:
- mvn-params: '-P docker -Dmaven.test.skip=true'
+ sbom-generator: true
+ mvn-params: "-P docker -Dmaven.test.skip=true"
build-node: ubuntu1804-docker-8c-8g
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
- project: 'aai/graphadmin'
+ container-public-registry: "nexus3.onap.org:10001"
+ container-staging-registry: "nexus3.onap.org:10003"
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
+ project: "aai/graphadmin"
stream:
- - 'master':
- branch: 'master'
- - 'kohn':
- branch: 'kohn'
- mvn-settings: 'aai-graphadmin-settings'
- mvn-version: 'mvn35'
- files: '**'
- archive-artifacts: ''
+ - "master":
+ branch: "master"
+ - "kohn":
+ branch: "kohn"
+ - "jakarta":
+ branch: "jakarta"
+ mvn-settings: "aai-graphadmin-settings"
+ mvn-version: "mvn35"
+ files: "**"
+ archive-artifacts: ""
build-node: ubuntu1804-builder-4c-4g
java-version: openjdk8
@@ -41,33 +44,32 @@
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
build-node: ubuntu1804-builder-4c-4g
- project: 'aai/graphadmin'
- project-name: 'aai-graphadmin'
- branch: 'master'
- mvn-settings: 'aai-graphadmin-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
- mvn-version: 'mvn35'
+ project: "aai/graphadmin"
+ project-name: "aai-graphadmin"
+ branch: "master"
+ mvn-settings: "aai-graphadmin-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
+ mvn-version: "mvn35"
java-version: openjdk8
- project:
name: aai-graphadmin-clm
jobs:
- gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
- project: 'aai/graphadmin'
- project-name: 'aai-graphadmin'
+ nexus-iq-namespace: "onap-"
+ project: "aai/graphadmin"
+ project-name: "aai-graphadmin"
stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'aai-graphadmin-settings'
- mvn-version: 'mvn35'
+ - "master":
+ branch: "master"
+ mvn-settings: "aai-graphadmin-settings"
+ mvn-version: "mvn35"
java-version: openjdk8
- project:
diff --git a/jjb/aai/aai-graphgraph.yaml b/jjb/aai/aai-graphgraph.yaml
index 160f0a7..dc4477e 100644
--- a/jjb/aai/aai-graphgraph.yaml
+++ b/jjb/aai/aai-graphgraph.yaml
@@ -7,59 +7,59 @@
- project:
name: aai-graphgraph-master
- project-name: 'aai-graphgraph'
+ project-name: "aai-graphgraph"
jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
+ - "{project-name}-{stream}-verify-java"
+ - "{project-name}-{stream}-merge-java"
- gerrit-maven-stage:
sign-artifacts: true
- build-node: centos7-builder-4c-4g
+ build-node: centos8-docker-4c-4g
maven-versions-plugin: true
sbom-generator: true
- gerrit-maven-docker-stage:
- mvn-params: '-P docker -Dmaven.test.skip=true'
+ sbom-generator: true
+ mvn-params: "-P docker -Dmaven.test.skip=true"
build-node: ubuntu1804-docker-8c-8g
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
- project: 'aai/graphgraph'
+ container-public-registry: "nexus3.onap.org:10001"
+ container-staging-registry: "nexus3.onap.org:10003"
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
+ project: "aai/graphgraph"
stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'aai-graphgraph-settings'
- files: '**'
- archive-artifacts: ''
+ - "master":
+ branch: "master"
+ mvn-settings: "aai-graphgraph-settings"
+ files: "**"
+ archive-artifacts: ""
- project:
name: aai-graphgraph-sonar
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
build-node: ubuntu1804-builder-4c-4g
- project: 'aai/graphgraph'
- project-name: 'aai-graphgraph'
- branch: 'master'
- mvn-settings: 'aai-graphgraph-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ project: "aai/graphgraph"
+ project-name: "aai-graphgraph"
+ branch: "master"
+ mvn-settings: "aai-graphgraph-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
- project:
name: aai-graphgraph-clm
jobs:
- gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
- project: 'aai/graphgraph'
- project-name: 'aai-graphgraph'
+ nexus-iq-namespace: "onap-"
+ project: "aai/graphgraph"
+ project-name: "aai-graphgraph"
stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'aai-graphgraph-settings'
+ - "master":
+ branch: "master"
+ mvn-settings: "aai-graphgraph-settings"
- project:
name: aai-graphgraph-info
diff --git a/jjb/aai/aai-logging-service.yaml b/jjb/aai/aai-logging-service.yaml
index f401301..37c0b18 100644
--- a/jjb/aai/aai-logging-service.yaml
+++ b/jjb/aai/aai-logging-service.yaml
@@ -7,56 +7,57 @@
- project:
name: aai-logging-service-master
- project-name: 'aai-logging-service'
+ project-name: "aai-logging-service"
jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
+ - "{project-name}-{stream}-verify-java"
+ - "{project-name}-{stream}-merge-java"
- gerrit-maven-stage:
sign-artifacts: true
- build-node: centos7-builder-4c-4g
+ build-node: centos8-docker-4c-4g
maven-versions-plugin: true
sbom-generator: true
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
- project: 'aai/logging-service'
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
+ project: "aai/logging-service"
stream:
- - 'kohn':
- branch: 'kohn'
- - 'master':
- branch: 'master'
- mvn-settings: 'aai-logging-service-settings'
- files: '**'
- archive-artifacts: ''
+ - "jakarta":
+ branch: "jakarta"
+ - "kohn":
+ branch: "kohn"
+ - "master":
+ branch: "master"
+ mvn-settings: "aai-logging-service-settings"
+ files: "**"
+ archive-artifacts: ""
- project:
name: aai-logging-service-sonar
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
build-node: ubuntu1804-builder-4c-4g
- project: 'aai/logging-service'
- project-name: 'aai-logging-service'
- branch: 'master'
- mvn-settings: 'aai-logging-service-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ project: "aai/logging-service"
+ project-name: "aai-logging-service"
+ branch: "master"
+ mvn-settings: "aai-logging-service-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
- project:
name: aai-logging-service-clm
jobs:
- gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
- project: 'aai/logging-service'
- project-name: 'aai-logging-service'
+ nexus-iq-namespace: "onap-"
+ project: "aai/logging-service"
+ project-name: "aai-logging-service"
stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'aai-logging-service-settings'
+ - "master":
+ branch: "master"
+ mvn-settings: "aai-logging-service-settings"
- project:
name: aai-logging-service-info
diff --git a/jjb/aai/aai-model-loader.yaml b/jjb/aai/aai-model-loader.yaml
index 2a87b7e..37cfc60 100644
--- a/jjb/aai/aai-model-loader.yaml
+++ b/jjb/aai/aai-model-loader.yaml
@@ -7,70 +7,72 @@
- project:
name: aai-model-loader-master
- project-name: 'aai-model-loader'
+ project-name: "aai-model-loader"
jobs:
- gerrit-maven-verify
- gerrit-maven-merge:
- cron: '@daily'
+ cron: "@daily"
- gerrit-maven-stage:
sign-artifacts: true
- build-node: centos7-builder-4c-4g
+ build-node: centos8-docker-4c-4g
maven-versions-plugin: true
sbom-generator: true
- gerrit-maven-docker-stage:
- mvn-params: '-P docker -B -Dmaven.test.skip=true'
+ sbom-generator: true
+ mvn-params: "-P docker -B -Dmaven.test.skip=true"
build-node: ubuntu1804-docker-8c-8g
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
- project: 'aai/model-loader'
+ container-public-registry: "nexus3.onap.org:10001"
+ container-staging-registry: "nexus3.onap.org:10003"
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
+ project: "aai/model-loader"
stream:
- - 'kohn':
- branch: 'kohn'
- - 'master':
- branch: 'master'
- mvn-settings: 'aai-model-loader-settings'
- files: '**'
- archive-artifacts: ''
+ - "jakarta":
+ branch: "jakarta"
+ - "kohn":
+ branch: "kohn"
+ - "master":
+ branch: "master"
+ mvn-settings: "aai-model-loader-settings"
+ files: "**"
+ archive-artifacts: ""
build-node: ubuntu1804-builder-4c-4g
- mvn-version: 'mvn36'
+ mvn-version: "mvn36"
java-version: openjdk11
- nexus-snapshot-repo: 'snapshots'
- mvn-snapshot-id: 'ecomp-snapshots'
+ nexus-snapshot-repo: "snapshots"
+ mvn-snapshot-id: "ecomp-snapshots"
- project:
name: aai-model-loader-sonar
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
build-node: ubuntu1804-builder-4c-4g
- project: 'aai/model-loader'
- project-name: 'aai-model-loader'
- branch: 'master'
- mvn-settings: 'aai-model-loader-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
- mvn-version: 'mvn36'
+ project: "aai/model-loader"
+ project-name: "aai-model-loader"
+ branch: "master"
+ mvn-settings: "aai-model-loader-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
+ mvn-version: "mvn36"
java-version: openjdk11
- project:
name: aai-model-loader-clm
jobs:
- gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
- project: 'aai/model-loader'
- project-name: 'aai-model-loader'
+ nexus-iq-namespace: "onap-"
+ project: "aai/model-loader"
+ project-name: "aai-model-loader"
stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'aai-model-loader-settings'
- mvn-version: 'mvn36'
+ - "master":
+ branch: "master"
+ mvn-settings: "aai-model-loader-settings"
+ mvn-version: "mvn36"
java-version: openjdk11
- project:
diff --git a/jjb/aai/aai-resources.yaml b/jjb/aai/aai-resources.yaml
index 0250b1b..6487fe8 100644
--- a/jjb/aai/aai-resources.yaml
+++ b/jjb/aai/aai-resources.yaml
@@ -7,36 +7,39 @@
- project:
name: aai-resources
- project-name: 'aai-resources'
+ project-name: "aai-resources"
jobs:
- - '{project-name}-{stream}-verify-java':
+ - "{project-name}-{stream}-verify-java":
build-node: ubuntu1804-docker-8c-8g
- - '{project-name}-{stream}-merge-java':
+ - "{project-name}-{stream}-merge-java":
build-node: ubuntu1804-docker-8c-8g
- gerrit-maven-stage:
- mvn-params: '-DskipTests'
+ mvn-params: "-DskipTests"
sign-artifacts: true
- build-node: centos7-builder-4c-4g
+ build-node: centos8-docker-4c-4g
maven-versions-plugin: true
sbom-generator: true
- gerrit-maven-docker-stage:
- mvn-params: '-P docker -Dmaven.test.skip=true'
+ sbom-generator: true
+ mvn-params: "-P docker -Dmaven.test.skip=true"
build-node: ubuntu1804-docker-8c-8g
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
+ container-public-registry: "nexus3.onap.org:10001"
+ container-staging-registry: "nexus3.onap.org:10003"
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
- project: 'aai/resources'
+ project: "aai/resources"
stream:
- - 'master':
- branch: 'master'
- - 'kohn':
- branch: 'kohn'
- mvn-settings: 'aai-resources-settings'
- mvn-version: 'mvn35'
- files: '**'
- archive-artifacts: ''
+ - "master":
+ branch: "master"
+ - "kohn":
+ branch: "kohn"
+ - "jakarta":
+ branch: "jakarta"
+ mvn-settings: "aai-resources-settings"
+ mvn-version: "mvn35"
+ files: "**"
+ archive-artifacts: ""
build-node: ubuntu1804-builder-4c-4g
java-version: openjdk8
@@ -45,33 +48,32 @@
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
build-node: ubuntu1804-docker-8c-8g
- project: 'aai/resources'
- project-name: 'aai-resources'
- branch: 'master'
- mvn-settings: 'aai-resources-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
- mvn-version: 'mvn35'
+ project: "aai/resources"
+ project-name: "aai-resources"
+ branch: "master"
+ mvn-settings: "aai-resources-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
+ mvn-version: "mvn35"
java-version: openjdk8
- project:
name: aai-resources-clm
jobs:
- gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
- project: 'aai/resources'
- project-name: 'aai-resources'
+ nexus-iq-namespace: "onap-"
+ project: "aai/resources"
+ project-name: "aai-resources"
stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'aai-resources-settings'
- mvn-version: 'mvn35'
+ - "master":
+ branch: "master"
+ mvn-settings: "aai-resources-settings"
+ mvn-version: "mvn35"
java-version: openjdk8
- project:
diff --git a/jjb/aai/aai-rest-client.yaml b/jjb/aai/aai-rest-client.yaml
index 4dd4663..fa09beb 100644
--- a/jjb/aai/aai-rest-client.yaml
+++ b/jjb/aai/aai-rest-client.yaml
@@ -7,56 +7,57 @@
- project:
name: aai-rest-client-master
- project-name: 'aai-rest-client'
+ project-name: "aai-rest-client"
jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
+ - "{project-name}-{stream}-verify-java"
+ - "{project-name}-{stream}-merge-java"
- gerrit-maven-stage:
sign-artifacts: true
- build-node: centos7-builder-4c-4g
+ build-node: centos8-docker-4c-4g
maven-versions-plugin: true
sbom-generator: true
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
- project: 'aai/rest-client'
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
+ project: "aai/rest-client"
stream:
- - 'kohn':
- branch: 'kohn'
- - 'master':
- branch: 'master'
- mvn-settings: 'aai-rest-client-settings'
- files: '**'
- archive-artifacts: ''
+ - "jakarta":
+ branch: "jakarta"
+ - "kohn":
+ branch: "kohn"
+ - "master":
+ branch: "master"
+ mvn-settings: "aai-rest-client-settings"
+ files: "**"
+ archive-artifacts: ""
- project:
name: aai-rest-client-sonar
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
build-node: ubuntu1804-builder-4c-4g
- project: 'aai/rest-client'
- project-name: 'aai-rest-client'
- branch: 'master'
- mvn-settings: 'aai-rest-client-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ project: "aai/rest-client"
+ project-name: "aai-rest-client"
+ branch: "master"
+ mvn-settings: "aai-rest-client-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
- project:
name: aai-rest-client-clm
jobs:
- gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
- project: 'aai/rest-client'
- project-name: 'aai-rest-client'
+ nexus-iq-namespace: "onap-"
+ project: "aai/rest-client"
+ project-name: "aai-rest-client"
stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'aai-rest-client-settings'
+ - "master":
+ branch: "master"
+ mvn-settings: "aai-rest-client-settings"
- project:
name: aai-rest-client-info
diff --git a/jjb/aai/aai-schema-service.yaml b/jjb/aai/aai-schema-service.yaml
index 4487da3..d5515a0 100644
--- a/jjb/aai/aai-schema-service.yaml
+++ b/jjb/aai/aai-schema-service.yaml
@@ -7,32 +7,35 @@
- project:
name: aai-schema-service
- project-name: 'aai-schema-service'
+ project-name: "aai-schema-service"
jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
+ - "{project-name}-{stream}-verify-java"
+ - "{project-name}-{stream}-merge-java"
- gerrit-maven-stage:
sign-artifacts: true
- build-node: centos7-builder-4c-4g
+ build-node: centos8-docker-4c-4g
maven-versions-plugin: true
sbom-generator: true
- gerrit-maven-docker-stage:
- mvn-params: '-P docker -Dmaven.test.skip=true'
+ sbom-generator: true
+ mvn-params: "-P docker -Dmaven.test.skip=true"
build-node: ubuntu1804-docker-8c-8g
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
- project: 'aai/schema-service'
+ container-public-registry: "nexus3.onap.org:10001"
+ container-staging-registry: "nexus3.onap.org:10003"
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
+ project: "aai/schema-service"
stream:
- - 'master':
- branch: 'master'
- - 'kohn':
- branch: 'kohn'
- mvn-settings: 'aai-schema-service-settings'
- mvn-version: 'mvn36'
- files: '**'
- archive-artifacts: ''
+ - "master":
+ branch: "master"
+ - "kohn":
+ branch: "kohn"
+ - "jakarta":
+ branch: "jakarta"
+ mvn-settings: "aai-schema-service-settings"
+ mvn-version: "mvn36"
+ files: "**"
+ archive-artifacts: ""
build-node: ubuntu1804-builder-4c-4g
java-version: openjdk11
@@ -41,34 +44,33 @@
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
build-node: ubuntu1804-builder-4c-4g
java-version: openjdk11
- project: 'aai/schema-service'
- project-name: 'aai-schema-service'
- branch: 'master'
- mvn-settings: 'aai-schema-service-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
- mvn-version: 'mvn36'
+ project: "aai/schema-service"
+ project-name: "aai-schema-service"
+ branch: "master"
+ mvn-settings: "aai-schema-service-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
+ mvn-version: "mvn36"
- project:
name: aai-schema-service-clm
jobs:
- gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
- project: 'aai/schema-service'
- project-name: 'aai-schema-service'
+ nexus-iq-namespace: "onap-"
+ project: "aai/schema-service"
+ project-name: "aai-schema-service"
java-version: openjdk11
stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'aai-schema-service-settings'
- mvn-version: 'mvn36'
+ - "master":
+ branch: "master"
+ mvn-settings: "aai-schema-service-settings"
+ mvn-version: "mvn36"
- project:
name: aai-schema-service-info
diff --git a/jjb/aai/aai-sparky-be.yaml b/jjb/aai/aai-sparky-be.yaml
index 7e178df..97eb3b1 100644
--- a/jjb/aai/aai-sparky-be.yaml
+++ b/jjb/aai/aai-sparky-be.yaml
@@ -7,69 +7,71 @@
- project:
name: aai-sparky-be-master
- project-name: 'aai-sparky-be'
+ project-name: "aai-sparky-be"
jobs:
- gerrit-maven-verify
- gerrit-maven-merge:
- cron: '@daily'
+ cron: "@daily"
- gerrit-maven-stage:
sign-artifacts: true
- build-node: centos7-builder-4c-4g
+ build-node: centos8-docker-4c-4g
maven-versions-plugin: true
sbom-generator: true
- gerrit-maven-docker-stage:
- mvn-params: '-f sparkybe-onap-application/pom.xml -P docker -B -Dmaven.test.skip=true'
+ sbom-generator: true
+ mvn-params: "-f sparkybe-onap-application/pom.xml -P docker -B -Dmaven.test.skip=true"
build-node: ubuntu1804-docker-8c-8g
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
- project: 'aai/sparky-be'
+ container-public-registry: "nexus3.onap.org:10001"
+ container-staging-registry: "nexus3.onap.org:10003"
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
+ project: "aai/sparky-be"
stream:
- - 'kohn':
- branch: 'kohn'
- - 'master':
- branch: 'master'
- mvn-settings: 'aai-sparky-be-settings'
- files: '**'
- archive-artifacts: ''
- mvn-version: 'mvn36'
+ - "jakarta":
+ branch: "jakarta"
+ - "kohn":
+ branch: "kohn"
+ - "master":
+ branch: "master"
+ mvn-settings: "aai-sparky-be-settings"
+ files: "**"
+ archive-artifacts: ""
+ mvn-version: "mvn36"
java-version: openjdk11
- nexus-snapshot-repo: 'snapshots'
- mvn-snapshot-id: 'ecomp-snapshots'
+ nexus-snapshot-repo: "snapshots"
+ mvn-snapshot-id: "ecomp-snapshots"
- project:
name: aai-sparky-be-sonar
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
build-node: ubuntu1804-builder-4c-4g
- project: 'aai/sparky-be'
- project-name: 'aai-sparky-be'
- branch: 'master'
- mvn-settings: 'aai-sparky-be-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
- mvn-version: 'mvn36'
+ project: "aai/sparky-be"
+ project-name: "aai-sparky-be"
+ branch: "master"
+ mvn-settings: "aai-sparky-be-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
+ mvn-version: "mvn36"
java-version: openjdk11
- project:
name: aai-sparky-be-clm
jobs:
- gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
- project: 'aai/sparky-be'
- project-name: 'aai-sparky-be'
+ nexus-iq-namespace: "onap-"
+ project: "aai/sparky-be"
+ project-name: "aai-sparky-be"
stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'aai-sparky-be-settings'
- mvn-version: 'mvn36'
+ - "master":
+ branch: "master"
+ mvn-settings: "aai-sparky-be-settings"
+ mvn-version: "mvn36"
java-version: openjdk11
- project:
diff --git a/jjb/aai/aai-sparky-fe.yaml b/jjb/aai/aai-sparky-fe.yaml
index d850746..257a6ff 100644
--- a/jjb/aai/aai-sparky-fe.yaml
+++ b/jjb/aai/aai-sparky-fe.yaml
@@ -1,26 +1,28 @@
---
- project:
name: sparky-fe
- project-name: 'aai-sparky-fe'
- build-node: 'centos8-builder-4c-4g'
+ project-name: "aai-sparky-fe"
+ build-node: "centos8-builder-4c-4g"
jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
+ - "{project-name}-{stream}-verify-java"
+ - "{project-name}-{stream}-merge-java"
- gerrit-maven-stage:
build-node: ubuntu1804-builder-4c-4g
maven-versions-plugin: true
sbom-generator: true
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
- project: 'aai/sparky-fe'
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
+ project: "aai/sparky-fe"
stream:
- - 'kohn':
- branch: 'kohn'
- - 'master':
- branch: 'master'
- mvn-settings: 'aai-sparky-fe-settings'
- files: '**'
- archive-artifacts: ''
+ - "jakarta":
+ branch: "jakarta"
+ - "kohn":
+ branch: "kohn"
+ - "master":
+ branch: "master"
+ mvn-settings: "aai-sparky-fe-settings"
+ files: "**"
+ archive-artifacts: ""
- project:
name: aai-sparky-fe-info
@@ -36,16 +38,15 @@
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
build-node: ubuntu1804-builder-4c-4g
- project: 'aai/sparky-fe'
- project-name: 'aai-sparky-fe'
- branch: 'master'
- mvn-settings: 'aai-sparky-be-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
- mvn-version: 'mvn35'
+ project: "aai/sparky-fe"
+ project-name: "aai-sparky-fe"
+ branch: "master"
+ mvn-settings: "aai-sparky-be-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
+ mvn-version: "mvn35"
diff --git a/jjb/aai/aai-traversal.yaml b/jjb/aai/aai-traversal.yaml
index 5d1ace5..2817c57 100644
--- a/jjb/aai/aai-traversal.yaml
+++ b/jjb/aai/aai-traversal.yaml
@@ -7,35 +7,38 @@
- project:
name: aai-traversal-master
- project-name: 'aai-traversal'
+ project-name: "aai-traversal"
jobs:
- - '{project-name}-{stream}-verify-java':
+ - "{project-name}-{stream}-verify-java":
build-node: ubuntu1804-docker-8c-8g
- - '{project-name}-{stream}-merge-java':
+ - "{project-name}-{stream}-merge-java":
build-node: ubuntu1804-docker-8c-8g
- gerrit-maven-stage:
- mvn-params: '-DskipTests'
+ mvn-params: "-DskipTests"
sign-artifacts: true
- build-node: centos7-builder-4c-4g
+ build-node: centos8-docker-4c-4g
maven-versions-plugin: true
sbom-generator: true
- gerrit-maven-docker-stage:
- mvn-params: '-P docker -Dmaven.test.skip=true'
+ sbom-generator: true
+ mvn-params: "-P docker -Dmaven.test.skip=true"
build-node: ubuntu1804-docker-8c-8g
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
- project: 'aai/traversal'
+ container-public-registry: "nexus3.onap.org:10001"
+ container-staging-registry: "nexus3.onap.org:10003"
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
+ project: "aai/traversal"
stream:
- - 'master':
- branch: 'master'
- - 'kohn':
- branch: 'kohn'
- mvn-settings: 'aai-traversal-settings'
- mvn-version: 'mvn35'
- files: '**'
- archive-artifacts: ''
+ - "master":
+ branch: "master"
+ - "kohn":
+ branch: "kohn"
+ - "jakarta":
+ branch: "jakarta"
+ mvn-settings: "aai-traversal-settings"
+ mvn-version: "mvn35"
+ files: "**"
+ archive-artifacts: ""
build-node: ubuntu1804-builder-4c-4g
java-version: openjdk8
@@ -44,33 +47,32 @@
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
build-node: ubuntu1804-docker-8c-8g
- project: 'aai/traversal'
- project-name: 'aai-traversal'
- branch: 'master'
- mvn-settings: 'aai-traversal-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
- mvn-version: 'mvn35'
+ project: "aai/traversal"
+ project-name: "aai-traversal"
+ branch: "master"
+ mvn-settings: "aai-traversal-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
+ mvn-version: "mvn35"
java-version: openjdk8
- project:
name: aai-traversal-clm
jobs:
- gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
- project: 'aai/traversal'
- project-name: 'aai-traversal'
+ nexus-iq-namespace: "onap-"
+ project: "aai/traversal"
+ project-name: "aai-traversal"
stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'aai-traversal-settings'
- mvn-version: 'mvn35'
+ - "master":
+ branch: "master"
+ mvn-settings: "aai-traversal-settings"
+ mvn-version: "mvn35"
java-version: openjdk8
- project:
diff --git a/jjb/ccsdk/apps.yaml b/jjb/ccsdk/apps.yaml
index b44259a..2fa6b72 100644
--- a/jjb/ccsdk/apps.yaml
+++ b/jjb/ccsdk/apps.yaml
@@ -7,105 +7,85 @@
- project:
name: ccsdk-apps
- project-name: 'ccsdk-apps'
+ project-name: "ccsdk-apps"
jobs:
- gerrit-maven-verify:
- mvn-params: '-Ddocker.skip.push=true -Pdocker'
+ mvn-params: "-Ddocker.skip.push=true -Pdocker"
- gerrit-maven-merge:
- cron: '@daily'
- mvn-params: '-Dmaven.test.skip=true'
+ cron: "@daily"
+ mvn-params: "-Dmaven.test.skip=true"
- gerrit-maven-stage:
- build-node: centos7-builder-4c-4g
+ build-node: centos8-docker-8c-8g
sign-artifacts: true
- mvn-params: '-Dmaven.test.skip=true'
- cron: ''
- sbom-generator: false
+ mvn-params: "-Dmaven.test.skip=true"
+ cron: ""
+ sbom-generator: true
- gerrit-maven-docker-stage:
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
- mvn-params: '-Dmaven.test.skip=true -Pdocker'
+ container-public-registry: "nexus3.onap.org:10001"
+ container-staging-registry: "nexus3.onap.org:10003"
+ mvn-params: "-Dmaven.test.skip=true -Pdocker"
maven-versions-plugin: true
- cron: '@daily'
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
+ cron: "@daily"
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
- project: 'ccsdk/apps'
+ project: "ccsdk/apps"
stream:
- - 'master':
- branch: 'master'
- - 'istanbul':
- branch: 'istanbul'
- - 'jakarta':
- branch: 'jakarta'
- - 'kohn':
- branch: 'kohn'
- java-version: openjdk11
- mvn-version: 'mvn38'
- mvn-settings: 'ccsdk-apps-settings'
+ - "master":
+ branch: "master"
+ java-version: openjdk17
+ - "kohn":
+ branch: "kohn"
+ java-version: openjdk11
+ mvn-version: "mvn38"
+ mvn-settings: "ccsdk-apps-settings"
# due to a strange macro / variable translation problem this needs to be
# passed as a string block to properly get the properties correctly defined
# in the job
maven-deploy-properties: |
deployAtEnd=true
- files: '**'
- archive-artifacts: ''
- build-node: centos7-docker-8c-8g
- mvn-snapshot-id: 'ecomp-snapshots'
- nexus-snapshot-repo: 'snapshots'
+ files: "**"
+ archive-artifacts: ""
+ build-node: centos8-docker-8c-8g
+ mvn-snapshot-id: "ecomp-snapshots"
+ nexus-snapshot-repo: "snapshots"
- project:
name: ccsdk-apps-sonar
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
build-node: ubuntu1804-builder-4c-4g
- project: 'ccsdk/apps'
- project-name: 'ccsdk-apps'
- branch: 'master'
- java-version: openjdk11
- mvn-version: 'mvn38'
- mvn-settings: 'ccsdk-apps-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ project: "ccsdk/apps"
+ project-name: "ccsdk-apps"
+ branch: "master"
+ java-version: openjdk17
+ mvn-version: "mvn38"
+ mvn-settings: "ccsdk-apps-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m"
- project:
name: ccsdk-apps-clm
jobs:
- gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
- project: 'ccsdk/apps'
- project-name: 'ccsdk-apps'
+ nexus-iq-namespace: "onap-"
+ project: "ccsdk/apps"
+ project-name: "ccsdk-apps"
stream:
- - 'master':
- branch: 'master'
- java-version: openjdk11
- mvn-version: 'mvn38'
- mvn-settings: 'ccsdk-apps-settings'
+ - "master":
+ branch: "master"
+ java-version: openjdk17
+ mvn-version: "mvn38"
+ mvn-settings: "ccsdk-apps-settings"
+ mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED"
build-node: ubuntu1804-builder-4c-4g
-#- project:
-# name: ccsdk-apps-arm64-docker
-# project-name: 'ccsdk-apps-arm64'
-# jobs:
-# - 'docker-version-java-daily':
-# mvn-params: '-Dmaven.test.skip=true'
-# project: 'ccsdk/apps'
-# stream:
-# - 'master':
-# branch: 'master'
-# mvn-settings: 'ccsdk-apps-settings'
-# files: '**'
-# archive-artifacts: ''
-# docker-pom: 'pom.xml'
-# mvn-profile: docker
-# build-node: ubuntu1804-docker-arm64-4c-2g
-
- project:
name: ccsdk-apps-info
project-name: ccsdk-apps
diff --git a/jjb/ccsdk/ccsdk-csit.yaml b/jjb/ccsdk/ccsdk-csit.yaml
index 2c107a9..fb49d92 100644
--- a/jjb/ccsdk/ccsdk-csit.yaml
+++ b/jjb/ccsdk/ccsdk-csit.yaml
@@ -2,51 +2,45 @@
- project:
name: ccsdk-distribution-csit
jobs:
- - '{project-name}-review-verification-maven-{stream}':
- mvn-params: '-Dmaven.test.skip=true -Ddocker.skip.push=true -Pdocker'
+ - "{project-name}-review-verification-maven-{stream}":
+ mvn-params: "-Dmaven.test.skip=true -Ddocker.skip.push=true -Pdocker"
maven-versions-plugin: true
- - '{project-name}-merge-verification-maven-{stream}':
- mvn-params: '-Dmaven.test.skip=true -Ddocker.skip.push=true -Pdocker'
+ - "{project-name}-merge-verification-maven-{stream}":
+ mvn-params: "-Dmaven.test.skip=true -Ddocker.skip.push=true -Pdocker"
maven-versions-plugin: true
- project-name: 'ccsdk-distribution'
- recipients: 'dtimoney@att.com'
+ project-name: "ccsdk-distribution"
+ recipients: "dtimoney@att.com"
# project name in gerrit
- project: 'ccsdk/distribution'
+ project: "ccsdk/distribution"
stream:
- - 'master':
- branch: 'master'
- - 'istanbul':
- branch: 'istanbul'
- - 'jakarta':
- branch: 'jakarta'
- - 'kohn':
- branch: 'kohn'
- mvn-settings: 'ccsdk-distribution-settings'
- mvn-version: 'mvn38'
- robot-options: ''
- branch: 'master'
+ - "master":
+ branch: "master"
+ - "kohn":
+ branch: "kohn"
+ mvn-settings: "ccsdk-distribution-settings"
+ mvn-version: "mvn38"
+ robot-options: ""
+ branch: "master"
- project:
name: ccsdk-oran-csit
jobs:
- - '{project-name}-review-verification-maven-{stream}':
- mvn-params: '-Dmaven.test.skip=true -Ddocker.skip.push=true -Pdocker'
- - '{project-name}-merge-verification-maven-{stream}':
- mvn-params: '-Dmaven.test.skip=true -Ddocker.skip.push=true -Pdocker'
- project-name: 'ccsdk-oran'
- recipients: 'bjorn.magnusson@est.tech martin.c.yan@est.tech'
+ - "{project-name}-review-verification-maven-{stream}":
+ mvn-params: "-Dmaven.test.skip=true -Ddocker.skip.push=true -Pdocker"
+ - "{project-name}-merge-verification-maven-{stream}":
+ mvn-params: "-Dmaven.test.skip=true -Ddocker.skip.push=true -Pdocker"
+ project-name: "ccsdk-oran"
+ recipients: "bjorn.magnusson@est.tech martin.c.yan@est.tech"
# project name in gerrit
- project: 'ccsdk/oran'
+ project: "ccsdk/oran"
stream:
- - 'master':
- branch: 'master'
- - 'istanbul':
- branch: 'istanbul'
- - 'jakarta':
- branch: 'jakarta'
- - 'kohn':
- branch: 'kohn'
- mvn-settings: 'ccsdk-oran-settings'
- mvn-version: 'mvn38'
- robot-options: ''
- branch: 'master'
+ - "master":
+ java-version: openjdk17
+ branch: "master"
+ - "kohn":
+ java-version: openjdk11
+ branch: "kohn"
+ mvn-settings: "ccsdk-oran-settings"
+ mvn-version: "mvn38"
+ robot-options: ""
+ branch: "master"
diff --git a/jjb/ccsdk/ccsdk-oran.yaml b/jjb/ccsdk/ccsdk-oran.yaml
index 741e744..b30eea6 100644
--- a/jjb/ccsdk/ccsdk-oran.yaml
+++ b/jjb/ccsdk/ccsdk-oran.yaml
@@ -1,64 +1,61 @@
---
- project:
name: ccsdk-oran
- project-name: 'ccsdk-oran'
+ project-name: "ccsdk-oran"
jobs:
- gerrit-maven-verify:
- cron: ''
+ cron: ""
- gerrit-maven-merge:
- cron: '@daily'
- mvn-params: '-Dmaven.test.skip=true'
+ cron: "@daily"
+ mvn-params: "-Dmaven.test.skip=true"
- gerrit-maven-stage:
- build-node: centos7-builder-4c-4g
+ build-node: centos8-docker-8c-8g
sign-artifacts: true
- mvn-params: '-Dmaven.test.skip=true'
- mvn-opts: '-Ddocker.skip=true'
- cron: ''
- sbom-generator: false
+ mvn-params: "-Dmaven.test.skip=true"
+ mvn-opts: "-Ddocker.skip=true"
+ cron: ""
+ sbom-generator: true
- gerrit-maven-docker-stage:
- build-node: centos7-docker-8c-8g
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
- mvn-params: '-Dmaven.test.skip=true -Pdocker'
+ build-node: centos8-docker-8c-8g
+ container-public-registry: "nexus3.onap.org:10001"
+ container-staging-registry: "nexus3.onap.org:10003"
+ mvn-params: "-Dmaven.test.skip=true -Pdocker"
maven-versions-plugin: true
- cron: '@daily'
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
- project: 'ccsdk/oran'
+ cron: "@daily"
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
+ project: "ccsdk/oran"
stream:
- - 'master':
- branch: 'master'
- - 'istanbul':
- branch: 'istanbul'
- - 'jakarta':
- branch: 'jakarta'
- - 'kohn':
- branch: 'kohn'
- java-version: openjdk11
- mvn-version: 'mvn38'
- mvn-settings: 'ccsdk-oran-settings'
- files: '**'
- archive-artifacts: ''
- docker-pom: 'pom.xml'
+ - "master":
+ branch: "master"
+ java-version: openjdk17
+ - "kohn":
+ branch: "kohn"
+ java-version: openjdk11
+ mvn-version: "mvn38"
+ mvn-settings: "ccsdk-oran-settings"
+ files: "**"
+ archive-artifacts: ""
+ docker-pom: "pom.xml"
mvn-profile: docker
- build-node: centos7-docker-8c-8g
- mvn-snapshot-id: 'ecomp-snapshots'
- nexus-snapshot-repo: 'snapshots'
+ build-node: centos8-docker-8c-8g
+ mvn-snapshot-id: "ecomp-snapshots"
+ nexus-snapshot-repo: "snapshots"
- project:
name: ccsdk-oran-clm
jobs:
- gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
- project: 'ccsdk/oran'
- project-name: 'ccsdk-oran'
+ nexus-iq-namespace: "onap-"
+ project: "ccsdk/oran"
+ project-name: "ccsdk-oran"
stream:
- - 'master':
- branch: 'master'
- java-version: openjdk11
- mvn-version: 'mvn38'
- mvn-settings: 'ccsdk-oran-settings'
- mvn-opts: '-Ddocker.skip=true'
+ - "master":
+ branch: "master"
+ java-version: openjdk17
+ mvn-version: "mvn38"
+ mvn-settings: "ccsdk-oran-settings"
+ mvn-opts: "-Ddocker.skip=true --add-opens=java.base/java.util=ALL-UNNAMED"
build-node: centos8-builder-4c-4g
- project:
@@ -74,22 +71,20 @@
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
gerrit_trigger_file_paths:
- compare-type: REG_EXP
- pattern: 'a1-policy-management/.*'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
- build-node: centos7-docker-8c-8g
- project: 'ccsdk/oran'
- project-name: 'ccsdk-oran'
- branch: 'master'
- java-version: openjdk11
- mvn-version: 'mvn38'
- mvn-settings: 'ccsdk-oran-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
- mvn-opts: '-Ddocker.skip=true'
- mvn-params: '-f a1-policy-management'
+ pattern: "a1-policy-management/.*"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
+ build-node: centos8-docker-8c-8g
+ project: "ccsdk/oran"
+ project-name: "ccsdk-oran"
+ branch: "master"
+ java-version: openjdk17
+ mvn-version: "mvn38"
+ mvn-settings: "ccsdk-oran-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -Ddocker.skip=true"
+ mvn-params: "-f a1-policy-management"
diff --git a/jjb/ccsdk/cds.yaml b/jjb/ccsdk/cds.yaml
index 06b7213..22c5606 100644
--- a/jjb/ccsdk/cds.yaml
+++ b/jjb/ccsdk/cds.yaml
@@ -1,124 +1,82 @@
---
- project:
- name: ccsdk-cds-java11
- project-name: 'ccsdk-cds'
+ name: ccsdk-cds-java17
+ project-name: "ccsdk-cds"
jobs:
- gerrit-maven-verify:
- mvn-params: '-Ddocker.skip.push=true -Pdocker'
+ mvn-params: "-Ddocker.skip.push=true -Pdocker"
- gerrit-maven-merge:
- cron: '@daily'
- mvn-params: '-Dmaven.test.skip=true'
+ cron: "@daily"
+ mvn-params: "-Dmaven.test.skip=true"
- gerrit-maven-stage:
- build-node: centos7-builder-4c-4g
+ build-node: centos8-docker-8c-8g
sign-artifacts: true
- mvn-params: '-Dmaven.test.skip=true'
- cron: ''
- sbom-generator: false
+ mvn-params: "-Dmaven.test.skip=true"
+ cron: ""
+ sbom-generator: true
- gerrit-maven-docker-stage:
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
- mvn-params: '-Dmaven.test.skip=true -Pdocker'
+ container-public-registry: "nexus3.onap.org:10001"
+ container-staging-registry: "nexus3.onap.org:10003"
+ mvn-params: "-Dmaven.test.skip=true -Pdocker"
maven-versions-plugin: true
- cron: '@daily'
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
+ cron: "@daily"
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
- project: 'ccsdk/cds'
+ project: "ccsdk/cds"
stream:
- - 'master':
- branch: 'master'
- - 'istanbul':
- branch: 'istanbul'
- - 'jakarta':
- branch: 'jakarta'
- - 'kohn':
- branch: 'kohn'
- java-version: openjdk11
- mvn-version: 'mvn38'
- mvn-settings: 'ccsdk-cds-settings'
+ - "master":
+ branch: "master"
+ java-version: openjdk17
+ - "kohn":
+ branch: "kohn"
+ java-version: openjdk11
+ mvn-version: "mvn38"
+ mvn-settings: "ccsdk-cds-settings"
# due to a strange macro / variable translation problem this needs to be
# passed as a string block to properly get the properties correctly defined
# in the job
maven-deploy-properties: |
deployAtEnd=true
- files: '**'
- archive-artifacts: ''
- build-node: centos7-docker-8c-8g
- mvn-snapshot-id: 'ecomp-snapshots'
- nexus-snapshot-repo: 'snapshots'
-
-- project:
- name: ccsdk-cds-java8
- project-name: 'ccsdk-cds'
- jobs:
- - gerrit-maven-verify:
- mvn-params: '-Ddocker.skip.push=true -P docker'
- - gerrit-maven-merge:
- cron: '@daily'
- mvn-params: '-Ddocker.skip.push=true -P docker'
- - gerrit-maven-stage:
- build-node: centos8-builder-4c-4g
- sign-artifacts: true
- mvn-params: '-Dmaven.test.skip=true'
- cron: ''
- - gerrit-maven-docker-stage:
- 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: 'ccsdk/cds'
- stream:
- - 'frankfurt':
- branch: 'frankfurt'
- java-version: openjdk8
- mvn-version: 'mvn38'
- mvn-settings: 'ccsdk-cds-settings'
- # due to a strange macro / variable translation problem this needs to be
- # passed as a string block to properly get the properties correctly defined
- # in the job
- maven-deploy-properties: |
- deployAtEnd=true
- files: '**'
- archive-artifacts: ''
- build-node: centos7-docker-8c-8g
- mvn-snapshot-id: 'ecomp-snapshots'
- nexus-snapshot-repo: 'snapshots'
+ files: "**"
+ archive-artifacts: ""
+ build-node: centos8-docker-8c-8g
+ mvn-snapshot-id: "ecomp-snapshots"
+ nexus-snapshot-repo: "snapshots"
- project:
name: ccsdk-cds-sonar
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
build-node: centos8-builder-4c-4g
- project: 'ccsdk/cds'
- project-name: 'ccsdk-cds'
- branch: 'master'
- java-version: openjdk11
- mvn-version: 'mvn38'
- mvn-settings: 'ccsdk-cds-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ project: "ccsdk/cds"
+ project-name: "ccsdk-cds"
+ branch: "master"
+ java-version: openjdk17
+ mvn-version: "mvn38"
+ mvn-settings: "ccsdk-cds-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m"
- project:
name: ccsdk-cds-clm
jobs:
- gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
- project: 'ccsdk/cds'
- project-name: 'ccsdk-cds'
+ nexus-iq-namespace: "onap-"
+ project: "ccsdk/cds"
+ project-name: "ccsdk-cds"
stream:
- - 'master':
- branch: 'master'
- java-version: openjdk11
- mvn-version: 'mvn38'
- mvn-settings: 'ccsdk-cds-settings'
+ - "master":
+ branch: "master"
+ java-version: openjdk17
+ mvn-version: "mvn38"
+ mvn-settings: "ccsdk-cds-settings"
+ mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED"
build-node: centos8-builder-4c-4g
- project:
diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml
index 51039a6..95988b1 100644
--- a/jjb/ccsdk/distribution.yaml
+++ b/jjb/ccsdk/distribution.yaml
@@ -1,90 +1,69 @@
---
- project:
name: ccsdk-distribution
- project-name: 'ccsdk-distribution'
+ project-name: "ccsdk-distribution"
jobs:
- gerrit-maven-verify:
- cron: ''
+ cron: ""
- gerrit-maven-merge:
- cron: '@daily'
- mvn-params: '-Dmaven.test.skip=true'
+ cron: "@daily"
+ mvn-params: "-Dmaven.test.skip=true"
- gerrit-maven-stage:
- build-node: centos7-builder-4c-4g
+ build-node: centos8-docker-8c-8g
sign-artifacts: true
- mvn-params: '-Dmaven.test.skip=true'
+ mvn-params: "-Dmaven.test.skip=true"
maven-versions-plugin: true
- cron: ''
- sbom-generator: false
+ cron: ""
+ sbom-generator: true
- gerrit-maven-docker-stage:
- build-node: centos7-docker-8c-8g
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
- mvn-params: '-Dmaven.test.skip=true -Ddocker.skip.run=true -Pdocker'
+ build-node: centos8-docker-8c-8g
+ container-public-registry: "nexus3.onap.org:10001"
+ container-staging-registry: "nexus3.onap.org:10003"
+ mvn-params: "-Dmaven.test.skip=true -Ddocker.skip.run=true -Pdocker"
maven-versions-plugin: true
- cron: '@daily'
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
+ cron: "@daily"
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
- project: 'ccsdk/distribution'
+ project: "ccsdk/distribution"
stream:
- - 'master':
- branch: 'master'
- - 'istanbul':
- branch: 'istanbul'
- - 'jakarta':
- branch: 'jakarta'
- - 'kohn':
- branch: 'kohn'
- java-version: openjdk11
- mvn-version: 'mvn38'
- mvn-settings: 'ccsdk-distribution-settings'
- files: '**'
- archive-artifacts: ''
- docker-pom: 'pom.xml'
+ - "master":
+ branch: "master"
+ java-version: openjdk11
+ - "kohn":
+ branch: "kohn"
+ java-version: openjdk17
+ mvn-version: "mvn38"
+ mvn-settings: "ccsdk-distribution-settings"
+ files: "**"
+ archive-artifacts: ""
+ docker-pom: "pom.xml"
mvn-profile: docker
- build-node: centos7-docker-8c-8g
- mvn-snapshot-id: 'ecomp-snapshots'
- nexus-snapshot-repo: 'snapshots'
+ build-node: centos8-docker-8c-8g
+ mvn-snapshot-id: "ecomp-snapshots"
+ nexus-snapshot-repo: "snapshots"
-
-#- project:
-# name: ccsdk-distribution-arm64-docker
-# project-name: 'ccsdk-distribution-arm64'
-# jobs:
-# - 'docker-version-java-daily':
-# mvn-params: '-Dmaven.test.skip=true'
-# project: 'ccsdk/distribution'
-# stream:
-# - 'master':
-# branch: 'master'
-# mvn-settings: 'ccsdk-distribution-settings'
-# files: '**'
-# archive-artifacts: ''
-# docker-pom: 'pom.xml'
-# mvn-profile: docker
-# build-node: centos7-docker-arm64-4c-2g
-#
- project:
name: ccsdk-distribution-clm
jobs:
- gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
- project: 'ccsdk/distribution'
- project-name: 'ccsdk-distribution'
+ nexus-iq-namespace: "onap-"
+ project: "ccsdk/distribution"
+ project-name: "ccsdk-distribution"
stream:
- - 'master':
- branch: 'master'
- java-version: openjdk11
- mvn-version: 'mvn38'
- mvn-settings: 'ccsdk-distribution-settings'
- build-node: centos7-docker-8c-8g
-
+ - "master":
+ branch: "master"
+ java-version: openjdk17
+ mvn-version: "mvn38"
+ mvn-settings: "ccsdk-distribution-settings"
+ mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED"
+ build-node: centos8-docker-8c-8g
- project:
name: ccsdk-distribution-info
project-name: ccsdk-distribution
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: ccsdk/distribution
branch: master
diff --git a/jjb/ccsdk/features.yaml b/jjb/ccsdk/features.yaml
index fe74392..fb89034 100644
--- a/jjb/ccsdk/features.yaml
+++ b/jjb/ccsdk/features.yaml
@@ -1,88 +1,85 @@
---
- project:
name: ccsdk-features
- project-name: 'ccsdk-features'
+ project-name: "ccsdk-features"
jobs:
- gerrit-maven-verify:
- cron: ''
+ cron: ""
- gerrit-maven-merge:
- cron: '@daily'
- mvn-params: '-Dmaven.test.skip=true'
+ cron: "@daily"
+ mvn-params: "-Dmaven.test.skip=true"
- gerrit-maven-stage:
- build-node: centos7-builder-4c-4g
+ build-node: centos8-docker-8c-8g
sign-artifacts: true
- mvn-params: '-Dmaven.test.skip=true'
- cron: ''
- sbom-generator: false
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
+ mvn-params: "-Dmaven.test.skip=true"
+ cron: ""
+ sbom-generator: true
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
- project: 'ccsdk/features'
+ project: "ccsdk/features"
stream:
- - 'master':
- branch: 'master'
- - 'istanbul':
- branch: 'istanbul'
- - 'jakarta':
- branch: 'jakarta'
- - 'kohn':
- branch: 'kohn'
- java-version: openjdk11
- mvn-version: 'mvn38'
- mvn-settings: 'ccsdk-features-settings'
+ - "master":
+ branch: "master"
+ java-version: openjdk17
+ mvn-opts: "-Xmx3072m"
+ - "kohn":
+ branch: "kohn"
+ java-version: openjdk11
+ mvn-opts: "-Xmx3072m -XX:MaxPermSize=1024m"
+ mvn-version: "mvn38"
+ mvn-settings: "ccsdk-features-settings"
# due to a strange macro / variable translation problem this needs to be
# passed as a string block to properly get the properties correctly defined
# in the job
maven-deploy-properties: |
deployAtEnd=true
- files: '**'
- archive-artifacts: ''
- mvn-opts: '-Xmx3072m -XX:MaxPermSize=1024m'
- build-node: centos7-builder-4c-4g
- mvn-snapshot-id: 'ecomp-snapshots'
- nexus-snapshot-repo: 'snapshots'
+ files: "**"
+ archive-artifacts: ""
+ build-node: centos8-builder-4c-4g
+ mvn-snapshot-id: "ecomp-snapshots"
+ nexus-snapshot-repo: "snapshots"
- project:
name: ccsdk-features-sonar
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
- build-node: centos7-builder-4c-4g
- project: 'ccsdk/features'
- project-name: 'ccsdk-features'
- branch: 'master'
- java-version: openjdk11
- mvn-version: 'mvn38'
- mvn-settings: 'ccsdk-features-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx3072m -XX:MaxPermSize=1024m'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
+ build-node: centos8-builder-4c-4g
+ project: "ccsdk/features"
+ project-name: "ccsdk-features"
+ branch: "master"
+ java-version: openjdk17
+ mvn-version: "mvn38"
+ mvn-settings: "ccsdk-features-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx3072m"
- project:
name: ccsdk-features-clm
jobs:
- gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
- project: 'ccsdk/features'
- project-name: 'ccsdk-features'
+ nexus-iq-namespace: "onap-"
+ project: "ccsdk/features"
+ project-name: "ccsdk-features"
stream:
- - 'master':
- branch: 'master'
- java-version: openjdk11
- mvn-version: 'mvn38'
- mvn-settings: 'ccsdk-features-settings'
- mvn-opts: '-Xmx3072m -XX:MaxPermSize=1024m'
- build-node: centos7-builder-4c-4g
+ - "master":
+ branch: "master"
+ java-version: openjdk17
+ mvn-version: "mvn38"
+ mvn-settings: "ccsdk-features-settings"
+ mvn-opts: "-Xmx3072m --add-opens=java.base/java.util=ALL-UNNAMED"
+ build-node: centos8-builder-4c-4g
- project:
name: ccsdk-features-info
project-name: ccsdk-features
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: ccsdk/features
branch: master
diff --git a/jjb/ccsdk/odl-legacy.yaml b/jjb/ccsdk/odl-legacy.yaml
index a3c64ce..538c5ba 100644
--- a/jjb/ccsdk/odl-legacy.yaml
+++ b/jjb/ccsdk/odl-legacy.yaml
@@ -6,10 +6,81 @@
- project-view
- project:
+ name: ccsdk-odl-legacy
+ project-name: "ccsdk-odl-legacy"
+ jobs:
+ - gerrit-maven-verify:
+ cron: ""
+ - gerrit-maven-merge:
+ cron: "@daily"
+ mvn-params: "-Dmaven.test.skip=true"
+ - gerrit-maven-stage:
+ build-node: centos8-docker-8c-8g
+ sign-artifacts: true
+ mvn-params: "-Dmaven.test.skip=true"
+ cron: ""
+ sbom-generator: true
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos8-docker-8c-8g
+
+ project: "ccsdk/odl-legacy"
+ stream:
+ - "master":
+ branch: "master"
+ java-version: openjdk17
+ mvn-version: "mvn38"
+ mvn-settings: "ccsdk-odl-legacy-settings"
+ # due to a strange macro / variable translation problem this needs to be
+ # passed as a string block to properly get the properties correctly defined
+ # in the job
+ maven-deploy-properties: |
+ deployAtEnd=true
+ files: "**"
+ archive-artifacts: ""
+ build-node: centos8-builder-4c-4g
+ mvn-snapshot-id: "ecomp-snapshots"
+ nexus-snapshot-repo: "snapshots"
+
+- project:
+ name: ccsdk-odl-legacy-sonar
+ jobs:
+ - gerrit-maven-sonar
+ sonarcloud: true
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
+ build-node: centos8-builder-4c-4g
+ project: "ccsdk/odl-legacy"
+ project-name: "ccsdk-odl-legacy"
+ branch: "master"
+ java-version: openjdk17
+ mvn-version: "mvn38"
+ mvn-settings: "ccsdk-odl-legacy-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m"
+
+- project:
+ name: ccsdk-odl-legacy-clm
+ jobs:
+ - gerrit-maven-clm
+ nexus-iq-namespace: "onap-"
+ project: "ccsdk/odl-legacy"
+ project-name: "ccsdk-odl-legacy"
+ stream:
+ - "master":
+ branch: "master"
+ java-version: openjdk17
+ mvn-version: "mvn38"
+ mvn-settings: "ccsdk-odl-legacy-settings"
+ mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED"
+ build-node: centos8-builder-4c-4g
+
+- project:
name: ccsdk-odl-legacy-info
project: ccsdk/odl-legacy
project-name: ccsdk-odl-legacy
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
branch: master
jobs:
- - gerrit-info-yaml-verify
\ No newline at end of file
+ - gerrit-info-yaml-verify
diff --git a/jjb/ccsdk/parent.yaml b/jjb/ccsdk/parent.yaml
index c095d7c..1790aef 100644
--- a/jjb/ccsdk/parent.yaml
+++ b/jjb/ccsdk/parent.yaml
@@ -1,76 +1,72 @@
---
- project:
name: ccsdk-parent
- project-name: 'ccsdk-parent'
+ project-name: "ccsdk-parent"
jobs:
- gerrit-maven-verify:
- cron: ''
+ cron: ""
- gerrit-maven-merge:
- cron: '@daily'
- mvn-params: '-Dmaven.test.skip=true'
+ cron: "@daily"
+ mvn-params: "-Dmaven.test.skip=true"
- gerrit-maven-stage:
- build-node: centos7-builder-4c-4g
+ build-node: centos8-docker-8c-8g
sign-artifacts: true
- mvn-params: '-Dmaven.test.skip=true'
- cron: ''
- sbom-generator: false
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
+ mvn-params: "-Dmaven.test.skip=true"
+ cron: ""
+ sbom-generator: true
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
- mvn-snapshot-id: 'ecomp-snapshots'
- nexus-snapshot-repo: 'snapshots'
- project: 'ccsdk/parent'
+ mvn-snapshot-id: "ecomp-snapshots"
+ nexus-snapshot-repo: "snapshots"
+ project: "ccsdk/parent"
stream:
- - 'master':
- branch: 'master'
+ - "master":
+ branch: "master"
+ java-version: openjdk17
jobs:
- gerrit-maven-verify:
- mvn-params: '-Drevision=3.0.0-SNAPSHOT'
+ mvn-params: "-Drevision=3.0.0-SNAPSHOT"
- gerrit-maven-merge:
- mvn-params: '-Dmaven.test.skip=true -Drevision=3.0.0-SNAPSHOT'
+ mvn-params: "-Dmaven.test.skip=true -Drevision=3.0.0-SNAPSHOT"
- gerrit-maven-stage:
- mvn-params: '-Dmaven.test.skip=true -Drevision=3.0.0'
- - '{project-name}-gerrit-release-jobs':
- mvn-params: '-Drevision=3.0.0'
- - 'honolulu':
- branch: 'honolulu'
- - 'istanbul':
- branch: 'istanbul'
- - 'jakarta':
- branch: 'jakarta'
- - 'kohn':
- branch: 'kohn'
- java-version: openjdk11
- mvn-version: 'mvn38'
- mvn-settings: 'ccsdk-parent-settings'
+ mvn-params: "-Dmaven.test.skip=true -Drevision=3.0.0"
+ - "{project-name}-gerrit-release-jobs":
+ mvn-params: "-Drevision=3.0.0"
+ - "kohn":
+ branch: "kohn"
+ java-version: openjdk11
+ mvn-version: "mvn38"
+ mvn-settings: "ccsdk-parent-settings"
# due to a strange macro / variable translation problem this needs to be
# passed as a string block to properly get the properties correctly defined
# in the job
maven-deploy-properties: |
deployAtEnd=true
- files: '**'
- archive-artifacts: ''
+ files: "**"
+ archive-artifacts: ""
- project:
name: ccsdk-parent-clm
jobs:
- gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
- project: 'ccsdk/parent'
- project-name: 'ccsdk-parent'
+ nexus-iq-namespace: "onap-"
+ project: "ccsdk/parent"
+ project-name: "ccsdk-parent"
stream:
- - 'master':
- branch: 'master'
- java-version: openjdk11
- mvn-version: 'mvn38'
- mvn-settings: 'ccsdk-parent-settings'
- build-node: centos7-builder-4c-4g
+ - "master":
+ branch: "master"
+ java-version: openjdk17
+ mvn-version: "mvn38"
+ mvn-settings: "ccsdk-parent-settings"
+ mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED"
+ build-node: centos8-builder-4c-4g
- project:
name: ccsdk-parent-info
project-name: ccsdk-parent
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: ccsdk/parent
branch: master
diff --git a/jjb/ccsdk/sli.yaml b/jjb/ccsdk/sli.yaml
index 57dd9c5..a0b2bcf 100644
--- a/jjb/ccsdk/sli.yaml
+++ b/jjb/ccsdk/sli.yaml
@@ -1,86 +1,83 @@
---
- project:
name: ccsdk-sli
- project-name: 'ccsdk-sli'
+ project-name: "ccsdk-sli"
jobs:
- gerrit-maven-verify:
- cron: ''
+ cron: ""
- gerrit-maven-merge:
- cron: '@daily'
- mvn-params: '-Dmaven.test.skip=true'
+ cron: "@daily"
+ mvn-params: "-Dmaven.test.skip=true"
- gerrit-maven-stage:
- build-node: centos7-builder-4c-4g
+ build-node: centos8-docker-8c-8g
sign-artifacts: true
- mvn-params: '-Dmaven.test.skip=true'
- cron: ''
- sbom-generator: false
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
+ mvn-params: "-Dmaven.test.skip=true"
+ cron: ""
+ sbom-generator: true
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
- project: 'ccsdk/sli'
+ project: "ccsdk/sli"
stream:
- - 'master':
- branch: 'master'
- - 'istanbul':
- branch: 'istanbul'
- - 'jakarta':
- branch: 'jakarta'
- - 'kohn':
- branch: 'kohn'
- java-version: openjdk11
- mvn-version: 'mvn38'
- mvn-settings: 'ccsdk-sli-settings'
+ - "master":
+ branch: "master"
+ java-version: openjdk17
+ - "kohn":
+ branch: "kohn"
+ java-version: openjdk11
+ mvn-version: "mvn38"
+ mvn-settings: "ccsdk-sli-settings"
# due to a strange macro / variable translation problem this needs to be
# passed as a string block to properly get the properties correctly defined
# in the job
maven-deploy-properties: |
deployAtEnd=true
- files: '**'
- archive-artifacts: ''
- build-node: centos7-builder-4c-4g
- mvn-snapshot-id: 'ecomp-snapshots'
- nexus-snapshot-repo: 'snapshots'
+ files: "**"
+ archive-artifacts: ""
+ build-node: centos8-builder-4c-4g
+ mvn-snapshot-id: "ecomp-snapshots"
+ nexus-snapshot-repo: "snapshots"
- project:
name: ccsdk-sli-sonar
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
- build-node: centos7-builder-4c-4g
- project: 'ccsdk/sli'
- project-name: 'ccsdk-sli'
- branch: 'master'
- java-version: openjdk11
- mvn-version: 'mvn38'
- mvn-settings: 'ccsdk-sli-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
+ build-node: centos8-builder-4c-4g
+ project: "ccsdk/sli"
+ project-name: "ccsdk-sli"
+ branch: "master"
+ java-version: openjdk17
+ mvn-version: "mvn38"
+ mvn-settings: "ccsdk-sli-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m"
- project:
name: ccsdk-sli-clm
jobs:
- gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
- project: 'ccsdk/sli'
- project-name: 'ccsdk-sli'
+ nexus-iq-namespace: "onap-"
+ project: "ccsdk/sli"
+ project-name: "ccsdk-sli"
stream:
- - 'master':
- branch: 'master'
- java-version: openjdk11
- mvn-version: 'mvn38'
- mvn-settings: 'ccsdk-sli-settings'
- build-node: centos7-builder-4c-4g
+ - "master":
+ branch: "master"
+ java-version: openjdk17
+ mvn-version: "mvn38"
+ mvn-settings: "ccsdk-sli-settings"
+ mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED"
+ build-node: centos8-builder-4c-4g
- project:
name: ccsdk-sli-info
project-name: ccsdk-sli
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: ccsdk/sli
branch: master
diff --git a/jjb/ci-management/ci-management-coverity.yaml b/jjb/ci-management/ci-management-coverity.yaml
index c9a8f5e..3eac479 100644
--- a/jjb/ci-management/ci-management-coverity.yaml
+++ b/jjb/ci-management/ci-management-coverity.yaml
@@ -2,7 +2,7 @@
# Coverity Scan static analysis
- job-template:
- name: '{project-name}-coverity'
+ name: "{project-name}-coverity"
id: onap-gerrit-maven-coverity
description: >
<hr/>
@@ -24,24 +24,24 @@
<hr/>
project-type: freestyle
- node: '{build-node}'
+ node: "{build-node}"
branch: master
build-days-to-keep: 7
build-timeout: 240
- cron: '@daily'
+ cron: "@daily"
disabled: false
dry-run: false
- git-url: '$GIT_URL/$PROJECT'
+ git-url: "$GIT_URL/$PROJECT"
java-version: openjdk8
mvn-global-settings: global-settings
- mvn-opts: ''
- mvn-params: ''
+ mvn-opts: ""
+ mvn-params: ""
mvn-version: mvn35
- coverity-project-name: ''
- coverity-token: ''
- coverity-user-email: ''
- coverity-search-paths: ''
- coverity-search-exclude-regexs: ''
+ coverity-project-name: ""
+ coverity-token: ""
+ coverity-user-email: ""
+ coverity-search-paths: ""
+ coverity-search-exclude-regexs: ""
max-git-repo-age-hours: 0
stream: master
submodule-recursive: true
@@ -63,37 +63,37 @@
properties:
- lf-infra-properties:
- build-days-to-keep: '{build-days-to-keep}'
+ build-days-to-keep: "{build-days-to-keep}"
parameters:
- lf-infra-parameters:
- project: '{project}'
- branch: '{branch}'
- stream: '{stream}'
+ project: "{project}"
+ branch: "{branch}"
+ stream: "{stream}"
- lf-infra-maven-parameters:
- mvn-opts: '{mvn-opts}'
- mvn-params: '{mvn-params}'
- mvn-version: '{mvn-version}'
+ mvn-opts: "{mvn-opts}"
+ mvn-params: "{mvn-params}"
+ mvn-version: "{mvn-version}"
- string:
name: ARCHIVE_ARTIFACTS
- default: '{archive-artifacts}'
+ default: "{archive-artifacts}"
description: Artifacts to archive to the logs server.
- string:
name: SEARCH_PATHS
- default: '{coverity-search-paths}'
+ default: "{coverity-search-paths}"
description: >
Additional directories to search for files to analyse by Coverity
Scan service (space separated).
- string:
name: SEARCH_EXCLUDE_REGEXS
- default: '{coverity-search-exclude-regexs}'
+ default: "{coverity-search-exclude-regexs}"
description: >
File path patterns to exclude from analysis by Coverity Scan
service (e.g. 3rd-party or auto-generated sources, space
separated).
- string:
name: COVERITY_USER_EMAIL
- default: '{coverity-user-email}'
+ default: "{coverity-user-email}"
description: >
E-mail address to receive analysis status report after submittion.
It must be a registered user on Coverity Scan service added as a
@@ -101,11 +101,11 @@
role.
- bool:
name: DRY_RUN
- default: '{dry-run}'
+ default: "{dry-run}"
description: Do not submit results to Coverity Scan server at the end of the build.
- string:
- name: 'MAX_GIT_REPO_AGE_HOURS'
- default: '{max-git-repo-age-hours}'
+ name: "MAX_GIT_REPO_AGE_HOURS"
+ default: "{max-git-repo-age-hours}"
description: >
If set to non-zero run the code scan only if there were no git
repository commits last MAX_GIT_REPO_AGE_HOURS hours.
@@ -113,22 +113,22 @@
job (e.g. if 'cron: @daily', then MAX_GIT_REPO_AGE_HOURS=48)
triggers:
- - timed: '{obj:cron}'
+ - timed: "{obj:cron}"
wrappers:
- lf-infra-wrappers:
- build-timeout: '{build-timeout}'
- jenkins-ssh-credential: '{jenkins-ssh-credential}'
+ build-timeout: "{build-timeout}"
+ jenkins-ssh-credential: "{jenkins-ssh-credential}"
builders:
- lf-infra-pre-build
- lf-maven-install:
- mvn-version: '{mvn-version}'
+ mvn-version: "{mvn-version}"
- lf-update-java-alternatives:
- java-version: '{java-version}'
+ java-version: "{java-version}"
- lf-provide-maven-settings:
global-settings-file: global-settings
- settings-file: '{mvn-settings}'
+ settings-file: "{mvn-settings}"
- inject:
properties-content: |
COVERITY_PROJECT_NAME={coverity-project-name}
@@ -143,11 +143,11 @@
scm:
- lf-infra-gerrit-scm:
- jenkins-ssh-credential: '{jenkins-ssh-credential}'
- git-url: '{git-url}'
+ jenkins-ssh-credential: "{jenkins-ssh-credential}"
+ git-url: "{git-url}"
refspec: $GERRIT_REFSPEC
branch: $GERRIT_BRANCH
- submodule-recursive: '{submodule-recursive}'
- submodule-timeout: '{submodule-timeout}'
- submodule-disable: '{submodule-disable}'
+ submodule-recursive: "{submodule-recursive}"
+ submodule-timeout: "{submodule-timeout}"
+ submodule-disable: "{submodule-disable}"
choosing-strategy: default
diff --git a/jjb/ci-management/ci-management-packer-jobs.yaml b/jjb/ci-management/ci-management-packer-jobs.yaml
index 74c9f96..4184950 100644
--- a/jjb/ci-management/ci-management-packer-jobs.yaml
+++ b/jjb/ci-management/ci-management-packer-jobs.yaml
@@ -8,13 +8,12 @@
project: ci-management
project-name: ci-management
branch: master
- archive-artifacts: '**/*.log'
+ archive-artifacts: "**/*.log"
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
build-timeout: 90
platforms:
- - centos-7
- centos-cs-8
- ubuntu-18.04
- ubuntu-20.04
@@ -30,18 +29,16 @@
project: ci-management
project-name: ci-management
branch: master
- archive-artifacts: '**/*.log'
+ archive-artifacts: "**/*.log"
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
build-timeout: 90
platforms:
- centos-7
- centos-cs-8
- - ubuntu-18.04-arm64
- ubuntu-18.04
- ubuntu-20.04
- - ubuntu-20.04-arm64
templates: docker
update-cloud-image: true
@@ -54,13 +51,12 @@
project: ci-management
project-name: ci-management
branch: master
- archive-artifacts: '**/*.log'
+ archive-artifacts: "**/*.log"
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
build-timeout: 90
platforms:
- - ubuntu-18.04
- ubuntu-20.04
templates: memcached
update-cloud-image: true
@@ -74,12 +70,11 @@
project: ci-management
project-name: ci-management
branch: master
- archive-artifacts: '**/*.log'
+ archive-artifacts: "**/*.log"
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
platforms:
- - centos-7
- centos-cs-8
templates: redis
update-cloud-image: true
@@ -93,12 +88,11 @@
project: ci-management
project-name: ci-management
branch: master
- archive-artifacts: '**/*.log'
+ archive-artifacts: "**/*.log"
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
platforms:
- - ubuntu-18.04
- ubuntu-20.04
templates: helm
update-cloud-image: true
diff --git a/jjb/ci-management/ci-management-views.yaml b/jjb/ci-management/ci-management-views.yaml
index ff3a7a3..2a3e474 100644
--- a/jjb/ci-management/ci-management-views.yaml
+++ b/jjb/ci-management/ci-management-views.yaml
@@ -1,5 +1,5 @@
---
-- releng_view: &releng_view_common
+- _releng_view: &releng_view_common
name: releng-view-common
view-type: list
filter-executors: false
@@ -18,20 +18,20 @@
recurse: false
- project:
- name: '00-Empty View'
+ name: "00-Empty View"
views:
- common-view
- view-name: '00-Empty View'
+ view-name: "00-Empty View"
view-description: >
Empty job view. This is used as the default landing view to keep the
Jenkins UI responding better while a) under high load and b) when there
are a lot of jobs defined in the system
- view-regex: ''
+ view-regex: ""
- view:
name: 01-Recent
- regex: '.*'
- description: 'List of most recent jobs'
+ regex: ".*"
+ description: "List of most recent jobs"
job-filters:
most-recent:
max-to-include: 25
@@ -43,15 +43,15 @@
views:
- common-view
view-name: All-Sonar
- view-regex: '^(?=.*-sonar)(?!.*-no-sonar).*'
- view-description: 'List of Sonar jobs'
+ view-regex: "^(?=.*-sonar)(?!.*-no-sonar).*"
+ view-description: "List of Sonar jobs"
- project:
name: All-Coverity
views:
- common-view
view-name: All-Coverity
- view-regex: '.*-coverity'
+ view-regex: ".*-coverity"
view-description: >
<h1>List of Coverity Scan static code analysis jobs</h1>
<p>See <a href="https://wiki.onap.org/x/Y6vQAw">how to add your component to Coverity Scan</a>
@@ -59,8 +59,8 @@
- view:
name: CLM
- description: 'List of CLM jobs'
- regex: '.*-clm-.*'
+ description: "List of CLM jobs"
+ regex: ".*-clm-.*"
view-type: list
filter-executors: false
filter-queue: false
@@ -80,53 +80,61 @@
views:
- csit-view
view-name: CSIT
- view-description: 'List of CSIT jobs'
- view-regex: '^(?=.*-csit-.*)(?!.*-verify-csit.*).*'
+ view-description: "List of CSIT jobs"
+ view-regex: "^(?=.*-csit-.*)(?!.*-verify-csit.*).*"
- project:
name: CSIT-Verify
views:
- csit-view
view-name: CSIT-Verify
- view-description: 'List of CSIT Verify jobs'
- view-regex: '^.*-verify-csit.*'
+ view-description: "List of CSIT Verify jobs"
+ view-regex: "^.*-verify-csit.*"
- view:
name: Daily-Jobs
views:
- common-view
view-name: Daily-Jobs
- view-description: 'List of Daily Jobs'
- view-regex: '.*-daily'
+ view-description: "List of Daily Jobs"
+ view-regex: ".*-daily"
- view:
name: External-Labs
views:
- common-view
view-name: External-Labs
- view-description: 'List of External Labs jobs'
- view-regex: '^lab-.*'
+ view-description: "List of External Labs jobs"
+ view-regex: "^lab-.*"
- project:
name: Merge-Jobs
views:
- common-view
view-name: Merge-Jobs
- view-description: 'List of Merge jobs'
- view-regex: '.*-merge-.*'
+ view-description: "List of Merge jobs"
+ view-regex: ".*-merge-.*"
- project:
name: Thirdparty
views:
- common-view
view-name: Thirdparty
- view-description: 'List of Nexus Thirdparty dependencies jobs'
- view-regex: '.*-thirdparty-.*'
+ view-description: "List of Nexus Thirdparty dependencies jobs"
+ view-regex: ".*-thirdparty-.*"
- project:
name: Verify-Jobs
views:
- common-view
view-name: Verify-Jobs
- view-description: 'List of Verify jobs'
- view-regex: '^.*-verify-.*'
+ view-description: "List of Verify jobs"
+ view-regex: "^.*-verify-.*"
+
+- project:
+ name: Release-Jobs
+ views:
+ - common-view
+ view-name: Release-Jobs
+ view-description: "List of Release Merge jobs"
+ view-regex: ".*release-merge.*"
diff --git a/jjb/ci-management/ci-management.yaml b/jjb/ci-management/ci-management.yaml
index f6000c7..6818dbd 100644
--- a/jjb/ci-management/ci-management.yaml
+++ b/jjb/ci-management/ci-management.yaml
@@ -10,7 +10,7 @@
project-name: ci-management
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: ci-management
branch: master
@@ -24,12 +24,12 @@
- gerrit-jjb-verify
- gerrit-packer-verify
- project: 'ci-management'
- project-name: 'ci-management'
- archive-artifacts: '**/*.log'
- branch: 'master'
- build-timeout: '60'
- build-node: 'centos7-builder-2c-1g'
+ project: "ci-management"
+ project-name: "ci-management"
+ archive-artifacts: "**/*.log"
+ branch: "master"
+ build-timeout: "60"
+ build-node: "centos8-builder-2c-1g"
jjb-version: 4.1.0
# configure the gerrit-jjb-verify job
build-node-label-check: true
@@ -42,11 +42,11 @@
project: ci-management
project-name: ci-management
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
jenkins-urls: >
- https://jenkins.onap.org
- https://jenkins.onap.org/sandbox
+ https://jenkins.onap.org
+ https://jenkins.onap.org/sandbox
openstack-cloud: vex
- project:
@@ -57,10 +57,10 @@
project: ci-management
project-name: ci-management
branch: master
- archive-artifacts: '**/*.log'
- jenkins-ssh-credential: "{jenkins-ssh-credential}"
+ archive-artifacts: "**/*.log"
+ jenkins-ssh-credential: onap-jenkins-ssh
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
# update-cloud-image: true
build-timeout: 10
diff --git a/jjb/cli/cli.yaml b/jjb/cli/cli.yaml
index bc94556..47d29e8 100644
--- a/jjb/cli/cli.yaml
+++ b/jjb/cli/cli.yaml
@@ -8,88 +8,67 @@
- project:
name: cli
java-version: openjdk11
- project-name: 'cli'
+ project-name: "cli"
jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
+ - "{project-name}-{stream}-verify-java"
+ - "{project-name}-{stream}-merge-java"
- gerrit-maven-stage:
sign-artifacts: true
- build-node: centos7-builder-4c-4g
+ build-node: centos8-docker-4c-4g
maven-versions-plugin: true
- gerrit-maven-docker-stage:
sign-artifacts: true
- build-node: centos7-docker-8c-8g
+ build-node: centos8-docker-8c-8g
maven-versions-plugin: true
- mvn-params: '-Dskip.docker.build=false -Dskip.docker.push=false -Dskip.docker.tag=false -Ddocker.push.registry=nexus3.onap.org:10003'
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
- - '{project-name}-{stream}-aai-docker-java-daily':
- pom: 'deployment/docker/pom.xml'
- mvn-goals: 'docker:build'
- docker-image-name: 'onap/cli'
+ # yamllint disable-line rule:line-length
+ mvn-params: "-Dskip.docker.build=false -Dskip.docker.push=false -Dskip.docker.tag=false -Ddocker.push.registry=nexus3.onap.org:10003"
+ container-public-registry: "nexus3.onap.org:10001"
+ container-staging-registry: "nexus3.onap.org:10003"
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
+ - "{project-name}-{stream}-aai-docker-java-daily":
+ pom: "deployment/docker/pom.xml"
+ mvn-goals: "docker:build"
+ docker-image-name: "onap/cli"
build-node: ubuntu1804-docker-8c-8g
- project: 'cli'
+ project: "cli"
stream:
- - 'master':
- branch: 'master'
- java-version: openjdk11
- - 'frankfurt':
- branch: 'frankfurt'
- java-version: openjdk8
- mvn-settings: 'cli-settings'
- files: '**'
- archive-artifacts: ''
+ - "master":
+ branch: "master"
+ java-version: openjdk11
+ mvn-settings: "cli-settings"
+ files: "**"
+ archive-artifacts: ""
build-node: ubuntu1804-builder-4c-4g
-#- project:
-# name: cli-arm64
-# project-name: 'cli-arm64'
-# jobs:
-# - '{project-name}-{stream}-aai-docker-java-daily':
-# pom: 'deployment/docker/pom.xml'
-# mvn-goals: 'docker:build'
-# docker-image-name: 'onap/cli'
-#
-# project: 'cli'
-# stream:
-# - 'master':
-# branch: 'master'
-# mvn-settings: 'cli-settings'
-# files: '**'
-# archive-artifacts: ''
-# build-node: ubuntu1804-docker-arm64-4c-2g
-#
- project:
name: cli-sonar
java-version: openjdk11
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
build-node: ubuntu1804-builder-4c-4g
- project: 'cli'
- project-name: 'cli'
- branch: 'master'
- mvn-settings: 'cli-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ project: "cli"
+ project-name: "cli"
+ branch: "master"
+ mvn-settings: "cli-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
- project:
name: cli-clm
java-version: openjdk11
jobs:
- gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
- project: 'cli'
- project-name: 'cli'
- branch: 'master'
- mvn-settings: 'cli-settings'
+ nexus-iq-namespace: "onap-"
+ project: "cli"
+ project-name: "cli"
+ branch: "master"
+ mvn-settings: "cli-settings"
build-node: ubuntu1804-builder-4c-4g
- project:
@@ -97,7 +76,7 @@
project-name: cli
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: cli
branch: master
@@ -109,14 +88,13 @@
jobs:
- gerrit-maven-sonar-verify
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
build-node: ubuntu1804-docker-8c-8g
- project: 'cli'
- project-name: 'cli'
- branch: 'master'
- mvn-settings: 'cli-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ project: "cli"
+ project-name: "cli"
+ branch: "master"
+ mvn-settings: "cli-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
diff --git a/jjb/cps/cps-cps-tbdmt.yaml b/jjb/cps/cps-cps-tbdmt.yaml
index 4bfbe3e..dbc44aa 100644
--- a/jjb/cps/cps-cps-tbdmt.yaml
+++ b/jjb/cps/cps-cps-tbdmt.yaml
@@ -9,77 +9,76 @@
name: cps-tbdmt-info
project: cps/cps-tbdmt
project-name: cps-cps-tbdmt
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
jobs:
- gerrit-info-yaml-verify
- project:
- name: cps-tbdmt-clm
- java-version: openjdk11
- mvn-version: "mvn36"
- maven-version: "mvn36"
- jobs:
- - gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
- project: cps/cps-tbdmt
- project-name: cps-cps-tbdmt
- branch: 'master'
- mvn-settings: 'cps-cps-tbdmt-settings'
- build-node: centos7-docker-8c-8g
+ name: cps-tbdmt-clm
+ java-version: openjdk11
+ mvn-version: "mvn36"
+ maven-version: "mvn36"
+ jobs:
+ - gerrit-maven-clm
+ nexus-iq-namespace: "onap-"
+ project: cps/cps-tbdmt
+ project-name: cps-cps-tbdmt
+ branch: "master"
+ mvn-settings: "cps-cps-tbdmt-settings"
+ build-node: centos8-docker-8c-8g
- project:
- name: cps-tbdmt
- java-version: openjdk11
- mvn-version: "mvn36"
- maven-version: "mvn36"
- project-name: cps-cps-tbdmt
- project: cps/cps-tbdmt
- mvn-snapshot-id: 'ecomp-snapshots'
- nexus-snapshot-repo: 'snapshots'
- jobs:
- - gerrit-maven-verify:
- mvn-goals: 'clean install'
- - gerrit-maven-merge
- - gerrit-maven-stage:
- sign-artifacts: true
- build-node: centos7-docker-8c-8g
- maven-versions-plugin: true
- - gerrit-maven-docker-stage:
- build-node: centos7-docker-8c-8g
- maven-versions-plugin: true
- mvn-params: '-P docker'
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
- stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'cps-cps-tbdmt-settings'
- files: '**'
- archive-artifacts: ''
- build-node: centos7-docker-8c-8g
+ name: cps-tbdmt
+ java-version: openjdk11
+ mvn-version: "mvn36"
+ maven-version: "mvn36"
+ project-name: cps-cps-tbdmt
+ project: cps/cps-tbdmt
+ mvn-snapshot-id: "ecomp-snapshots"
+ nexus-snapshot-repo: "snapshots"
+ jobs:
+ - gerrit-maven-verify:
+ mvn-goals: "clean install"
+ - gerrit-maven-merge
+ - gerrit-maven-stage:
+ sign-artifacts: true
+ build-node: centos8-docker-8c-8g
+ maven-versions-plugin: true
+ - gerrit-maven-docker-stage:
+ build-node: centos8-docker-8c-8g
+ maven-versions-plugin: true
+ mvn-params: "-P docker"
+ container-public-registry: "nexus3.onap.org:10001"
+ container-staging-registry: "nexus3.onap.org:10003"
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
+ stream:
+ - "master":
+ branch: "master"
+ mvn-settings: "cps-cps-tbdmt-settings"
+ files: "**"
+ archive-artifacts: ""
+ build-node: centos8-docker-8c-8g
- project:
- name: cps-tbdmt-sonar
- java-version: openjdk11
- mvn-version: "mvn36"
- maven-version: "mvn36"
- jobs:
- - gerrit-maven-sonar
- sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
- build-node: centos7-docker-8c-8g
- project: 'cps/cps-tbdmt'
- project-name: 'cps-cps-tbdmt'
- branch: 'master'
- mvn-settings: 'cps-cps-tbdmt-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ name: cps-tbdmt-sonar
+ java-version: openjdk11
+ mvn-version: "mvn36"
+ maven-version: "mvn36"
+ jobs:
+ - gerrit-maven-sonar
+ sonarcloud: true
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
+ build-node: centos8-docker-8c-8g
+ project: "cps/cps-tbdmt"
+ project-name: "cps-cps-tbdmt"
+ branch: "master"
+ mvn-settings: "cps-cps-tbdmt-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
- project:
name: cps-tbdmt-sonar-verify
@@ -89,15 +88,14 @@
jobs:
- gerrit-maven-sonar-verify
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
sonarcloud-qualitygate-wait: true
- sonar-mvn-goal: '{sonar_mvn_goal}'
- build-node: centos7-docker-8c-8g
- project: 'cps/cps-tbdmt'
- project-name: 'cps-cps-tbdmt'
- branch: 'master'
- mvn-settings: 'cps-cps-tbdmt-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ build-node: centos8-docker-8c-8g
+ project: "cps/cps-tbdmt"
+ project-name: "cps-cps-tbdmt"
+ branch: "master"
+ mvn-settings: "cps-cps-tbdmt-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
diff --git a/jjb/cps/cps-cps-temporal-csit.yaml b/jjb/cps/cps-cps-temporal-csit.yaml
index 362ef58..4c27b92 100644
--- a/jjb/cps/cps-cps-temporal-csit.yaml
+++ b/jjb/cps/cps-cps-temporal-csit.yaml
@@ -1,23 +1,23 @@
---
- project:
- name: cps-cps-temporal-csit
- jobs:
- - '{project-name}-review-verification-maven-{stream}':
- mvn-goals: clean install
- mvn-params: '-Dmaven.test.skip=true -Ddocker.repository.push= -Pdocker'
- - '{project-name}-merge-verification-maven-{stream}':
- mvn-goals: clean install
- mvn-params: '-Dmaven.test.skip=true -Ddocker.repository.push= -Pdocker'
- project-name: 'cps-cps-temporal'
- recipients: 'toine.siebelink@est.tech'
- # project name in gerrit
- project: 'cps/cps-temporal'
- stream:
- - 'master':
- branch: 'master'
- - 'jakarta':
- branch: 'jakarta'
- - 'kohn':
- branch: 'kohn'
- mvn-settings: 'cps-cps-temporal-settings'
- robot-options: ''
+ name: cps-cps-temporal-csit
+ jobs:
+ - "{project-name}-review-verification-maven-{stream}":
+ mvn-goals: clean install
+ mvn-params: "-Dmaven.test.skip=true -Ddocker.repository.push= -Pdocker"
+ - "{project-name}-merge-verification-maven-{stream}":
+ mvn-goals: clean install
+ mvn-params: "-Dmaven.test.skip=true -Ddocker.repository.push= -Pdocker"
+ project-name: "cps-cps-temporal"
+ recipients: "toine.siebelink@est.tech"
+ # project name in gerrit
+ project: "cps/cps-temporal"
+ stream:
+ - "master":
+ branch: "master"
+ - "jakarta":
+ branch: "jakarta"
+ - "kohn":
+ branch: "kohn"
+ mvn-settings: "cps-cps-temporal-settings"
+ robot-options: ""
diff --git a/jjb/cps/cps-cps-temporal.yaml b/jjb/cps/cps-cps-temporal.yaml
index 2e32340..67962e7 100644
--- a/jjb/cps/cps-cps-temporal.yaml
+++ b/jjb/cps/cps-cps-temporal.yaml
@@ -9,7 +9,7 @@
name: cps-cps-temporal-info
project: cps/cps-temporal
project-name: cps-cps-temporal
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
jobs:
- gerrit-info-yaml-verify
@@ -20,8 +20,8 @@
maven-version: mvn36
project-name: cps-cps-temporal
project: cps/cps-temporal
- mvn-snapshot-id: 'ecomp-snapshots'
- nexus-snapshot-repo: 'snapshots'
+ mvn-snapshot-id: "ecomp-snapshots"
+ nexus-snapshot-repo: "snapshots"
jobs:
- gerrit-maven-docker-verify:
container-public-registry: nexus3.onap.org:10001
@@ -29,26 +29,26 @@
container-public-registry: nexus3.onap.org:10001
container-snapshot-registry: nexus3.onap.org:10003
- gerrit-maven-docker-stage:
- build-node: centos7-docker-8c-8g
+ build-node: centos8-docker-8c-8g
maven-versions-plugin: true
mvn-params: -Pdocker
container-public-registry: nexus3.onap.org:10001
container-staging-registry: nexus3.onap.org:10003
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
stream:
- - 'master':
+ - "master":
branch: master
- - 'jakarta':
- branch: 'jakarta'
- cron: ''
- - 'kohn':
- branch: 'kohn'
- cron: ''
+ - "jakarta":
+ branch: "jakarta"
+ cron: ""
+ - "kohn":
+ branch: "kohn"
+ cron: ""
mvn-settings: cps-cps-temporal-settings
- files: '**'
- archive-artifacts: ''
- build-node: centos7-docker-8c-8g
+ files: "**"
+ archive-artifacts: ""
+ build-node: centos8-docker-8c-8g
- project:
name: cps-cps-temporal-clm
@@ -62,7 +62,7 @@
project-name: cps-cps-temporal
branch: master
mvn-settings: cps-cps-temporal-settings
- build-node: centos7-docker-8c-8g
+ build-node: centos8-docker-8c-8g
- project:
name: cps-cps-temporal-sonar
@@ -72,18 +72,17 @@
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
- build-node: centos7-docker-8c-8g
- project: 'cps/cps-temporal'
- project-name: 'cps-cps-temporal'
- branch: 'master'
- mvn-settings: 'cps-cps-temporal-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
+ build-node: centos8-docker-8c-8g
+ project: "cps/cps-temporal"
+ project-name: "cps-cps-temporal"
+ branch: "master"
+ mvn-settings: "cps-cps-temporal-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
- project:
name: cps-cps-temporal-sonar-verify
@@ -93,15 +92,14 @@
jobs:
- gerrit-maven-sonar-verify
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
sonarcloud-qualitygate-wait: true
- sonar-mvn-goal: '{sonar_mvn_goal}'
- build-node: centos7-docker-8c-8g
- project: 'cps/cps-temporal'
- project-name: 'cps-cps-temporal'
- branch: 'master'
- mvn-settings: 'cps-cps-temporal-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ build-node: centos8-docker-8c-8g
+ project: "cps/cps-temporal"
+ project-name: "cps-cps-temporal"
+ branch: "master"
+ mvn-settings: "cps-cps-temporal-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
diff --git a/jjb/cps/cps-csit.yaml b/jjb/cps/cps-csit.yaml
index ec61636..e61ce2f 100644
--- a/jjb/cps/cps-csit.yaml
+++ b/jjb/cps/cps-csit.yaml
@@ -1,25 +1,25 @@
---
- project:
- name: cps-csit
- jobs:
- - '{project-name}-review-verification-maven-{stream}':
- mvn-goals: clean install
- mvn-params: '-Dmaven.test.skip=true -Ddocker.repository.push='
- - '{project-name}-merge-verification-maven-{stream}':
- mvn-goals: clean install
- mvn-params: '-Dmaven.test.skip=true -Ddocker.repository.push='
- project-name: 'cps'
- build-node: ubuntu1804-docker-8c-8g
- recipients: 'toine.siebelink@est.tech'
- # project name in gerrit
- project: 'cps'
- stream:
- - 'master':
- branch: 'master'
- - 'jakarta':
- branch: 'jakarta'
- - 'kohn':
- branch: 'kohn'
- mvn-settings: 'cps-settings'
- robot-options: ''
- branch: 'master'
+ name: cps-csit
+ jobs:
+ - "{project-name}-review-verification-maven-{stream}":
+ mvn-goals: clean install
+ mvn-params: "-Dmaven.test.skip=true -Ddocker.repository.push="
+ - "{project-name}-merge-verification-maven-{stream}":
+ mvn-goals: clean install
+ mvn-params: "-Dmaven.test.skip=true -Ddocker.repository.push="
+ project-name: "cps"
+ build-node: ubuntu1804-docker-8c-8g
+ recipients: "toine.siebelink@est.tech"
+ # project name in gerrit
+ project: "cps"
+ stream:
+ - "master":
+ branch: "master"
+ - "jakarta":
+ branch: "jakarta"
+ - "kohn":
+ branch: "kohn"
+ mvn-settings: "cps-settings"
+ robot-options: ""
+ branch: "master"
diff --git a/jjb/cps/cps-ncmp-dmi-plugin-csit.yaml b/jjb/cps/cps-ncmp-dmi-plugin-csit.yaml
index e43de25..f8e5552 100644
--- a/jjb/cps/cps-ncmp-dmi-plugin-csit.yaml
+++ b/jjb/cps/cps-ncmp-dmi-plugin-csit.yaml
@@ -1,23 +1,23 @@
---
- project:
- name: cps-ncmp-dmi-plugin-csit
- jobs:
- - '{project-name}-review-verification-maven-{stream}':
- mvn-goals: clean install
- mvn-params: '-Dmaven.test.skip=true -Pdocker'
- - '{project-name}-merge-verification-maven-{stream}':
- mvn-goals: clean install
- mvn-params: '-Dmaven.test.skip=true -Pdocker'
- project-name: 'cps-ncmp-dmi-plugin'
- recipients: 'toine.siebelink@est.tech'
- # project name in gerrit
- project: 'cps/ncmp-dmi-plugin'
- stream:
- - 'master':
- branch: 'master'
- - 'jakarta':
- branch: 'jakarta'
- - 'kohn':
- branch: 'kohn'
- mvn-settings: 'cps-ncmp-dmi-plugin-settings'
- robot-options: ''
+ name: cps-ncmp-dmi-plugin-csit
+ jobs:
+ - "{project-name}-review-verification-maven-{stream}":
+ mvn-goals: clean install
+ mvn-params: "-Dmaven.test.skip=true -Pdocker"
+ - "{project-name}-merge-verification-maven-{stream}":
+ mvn-goals: clean install
+ mvn-params: "-Dmaven.test.skip=true -Pdocker"
+ project-name: "cps-ncmp-dmi-plugin"
+ recipients: "toine.siebelink@est.tech"
+ # project name in gerrit
+ project: "cps/ncmp-dmi-plugin"
+ stream:
+ - "master":
+ branch: "master"
+ - "jakarta":
+ branch: "jakarta"
+ - "kohn":
+ branch: "kohn"
+ mvn-settings: "cps-ncmp-dmi-plugin-settings"
+ robot-options: ""
diff --git a/jjb/cps/cps-ncmp-dmi-plugin.yaml b/jjb/cps/cps-ncmp-dmi-plugin.yaml
index 0b8c3df..908f865 100644
--- a/jjb/cps/cps-ncmp-dmi-plugin.yaml
+++ b/jjb/cps/cps-ncmp-dmi-plugin.yaml
@@ -9,7 +9,7 @@
name: cps-ncmp-dmi-plugin-info
project: cps/ncmp-dmi-plugin
project-name: cps-ncmp-dmi-plugin
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
jobs:
- gerrit-info-yaml-verify
@@ -20,38 +20,41 @@
maven-version: mvn36
project-name: cps-ncmp-dmi-plugin
project: cps/ncmp-dmi-plugin
- mvn-snapshot-id: 'ecomp-snapshots'
- nexus-snapshot-repo: 'snapshots'
+ mvn-snapshot-id: "ecomp-snapshots"
+ nexus-snapshot-repo: "snapshots"
jobs:
- gerrit-maven-docker-verify:
container-public-registry: nexus3.onap.org:10001
- gerrit-maven-merge
- gerrit-maven-stage:
sign-artifacts: true
- build-node: centos7-docker-8c-8g
+ build-node: centos8-docker-8c-8g
maven-versions-plugin: true
- sbom-generator: false
+ sbom-generator: true
- gerrit-maven-docker-stage:
- build-node: centos7-docker-8c-8g
+ build-node: centos8-docker-8c-8g
maven-versions-plugin: true
mvn-params: -Pdocker
container-public-registry: nexus3.onap.org:10001
container-staging-registry: nexus3.onap.org:10003
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
stream:
- - 'master':
+ - "master":
branch: master
- - 'jakarta':
- branch: 'jakarta'
- cron: ''
- - 'kohn':
- branch: 'kohn'
- cron: ''
+ - "jakarta":
+ branch: "jakarta"
+ cron: ""
+ - "kohn":
+ branch: "kohn"
+ cron: ""
+ - "london":
+ branch: "london"
+ cron: ""
mvn-settings: cps-ncmp-dmi-plugin-settings
- files: '**'
- archive-artifacts: ''
- build-node: centos7-docker-8c-8g
+ files: "**"
+ archive-artifacts: ""
+ build-node: centos8-docker-8c-8g
- project:
name: cps-ncmp-dmi-plugin-clm
@@ -65,7 +68,7 @@
project-name: cps-ncmp-dmi-plugin
branch: master
mvn-settings: cps-ncmp-dmi-plugin-settings
- build-node: centos7-docker-8c-8g
+ build-node: centos8-docker-8c-8g
- project:
name: cps-ncmp-dmi-plugin-sonar
@@ -75,18 +78,17 @@
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
- build-node: centos7-docker-8c-8g
- project: 'cps/ncmp-dmi-plugin'
- project-name: 'cps-ncmp-dmi-plugin'
- branch: 'master'
- mvn-settings: 'cps-ncmp-dmi-plugin-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
+ build-node: centos8-docker-8c-8g
+ project: "cps/ncmp-dmi-plugin"
+ project-name: "cps-ncmp-dmi-plugin"
+ branch: "master"
+ mvn-settings: "cps-ncmp-dmi-plugin-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
- project:
name: cps-ncmp-dmi-plugin-sonar-verify
@@ -96,15 +98,14 @@
jobs:
- gerrit-maven-sonar-verify
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
sonarcloud-qualitygate-wait: true
- sonar-mvn-goal: '{sonar_mvn_goal}'
- build-node: centos7-docker-8c-8g
- project: 'cps/ncmp-dmi-plugin'
- project-name: 'cps-ncmp-dmi-plugin'
- branch: 'master'
- mvn-settings: 'cps-ncmp-dmi-plugin-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ build-node: centos8-docker-8c-8g
+ project: "cps/ncmp-dmi-plugin"
+ project-name: "cps-ncmp-dmi-plugin"
+ branch: "master"
+ mvn-settings: "cps-ncmp-dmi-plugin-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
diff --git a/jjb/cps/cps.yaml b/jjb/cps/cps.yaml
index 6049052..1f6ffe4 100644
--- a/jjb/cps/cps.yaml
+++ b/jjb/cps/cps.yaml
@@ -9,62 +9,65 @@
name: cps-info
project: cps
project-name: cps
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
jobs:
- gerrit-info-yaml-verify
- project:
- name: cps-clm
- java-version: openjdk11
- mvn-version: "mvn36"
- maven-version: "mvn36"
- jobs:
- - gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
- project: 'cps'
- project-name: 'cps'
- branch: 'master'
- mvn-settings: 'cps-settings'
- build-node: centos7-docker-8c-8g
+ name: cps-clm
+ java-version: openjdk11
+ mvn-version: "mvn36"
+ maven-version: "mvn36"
+ jobs:
+ - gerrit-maven-clm
+ nexus-iq-namespace: "onap-"
+ project: "cps"
+ project-name: "cps"
+ branch: "master"
+ mvn-settings: "cps-settings"
+ build-node: centos8-docker-8c-8g
- project:
name: cps
java-version: openjdk11
mvn-version: "mvn36"
maven-version: "mvn36"
- project-name: 'cps'
- project: 'cps'
+ project-name: "cps"
+ project: "cps"
jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java':
- docker-pom: 'pom.xml'
+ - "{project-name}-{stream}-verify-java"
+ - "{project-name}-{stream}-merge-java":
+ docker-pom: "pom.xml"
mvn-params: "-P cps-ncmp-docker"
- gerrit-maven-stage:
sign-artifacts: true
- build-node: centos7-docker-8c-8g
+ build-node: centos8-docker-8c-8g
maven-versions-plugin: true
- sbom-generator: false
+ sbom-generator: true
- gerrit-maven-docker-stage:
- build-node: centos7-docker-8c-8g
+ build-node: centos8-docker-8c-8g
maven-versions-plugin: true
- mvn-params: '-P cps-ncmp-docker'
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
+ mvn-params: "-P cps-ncmp-docker"
+ container-public-registry: "nexus3.onap.org:10001"
+ container-staging-registry: "nexus3.onap.org:10003"
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
stream:
- - 'master':
- branch: 'master'
- - 'jakarta':
- branch: 'jakarta'
- cron: ''
- - 'kohn':
- branch: 'kohn'
- cron: ''
- mvn-settings: 'cps-settings'
- files: '**'
- archive-artifacts: ''
- build-node: centos7-docker-8c-8g
+ - "master":
+ branch: "master"
+ - "jakarta":
+ branch: "jakarta"
+ cron: ""
+ - "kohn":
+ branch: "kohn"
+ cron: ""
+ - "london":
+ branch: "london"
+ cron: ""
+ mvn-settings: "cps-settings"
+ files: "**"
+ archive-artifacts: ""
+ build-node: centos8-docker-8c-8g
- project:
name: cps-sonar
@@ -74,18 +77,17 @@
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
- build-node: centos7-docker-8c-8g
- project: 'cps'
- project-name: 'cps'
- branch: 'master'
- mvn-settings: 'cps-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
+ build-node: centos8-docker-8c-8g
+ project: "cps"
+ project-name: "cps"
+ branch: "master"
+ mvn-settings: "cps-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
- project:
name: cps-sonar-verify
@@ -95,15 +97,14 @@
jobs:
- gerrit-maven-sonar-verify
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
sonarcloud-qualitygate-wait: true
- sonar-mvn-goal: '{sonar_mvn_goal}'
- build-node: centos7-docker-8c-8g
- project: 'cps'
- project-name: 'cps'
- branch: 'master'
- mvn-settings: 'cps-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ build-node: centos8-docker-8c-8g
+ project: "cps"
+ project-name: "cps"
+ branch: "master"
+ mvn-settings: "cps-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
diff --git a/jjb/dcaegen2/dcaegen2-analytics-flink.yaml b/jjb/dcaegen2/dcaegen2-analytics-flink.yaml
index 9d76d41..6b9321c 100644
--- a/jjb/dcaegen2/dcaegen2-analytics-flink.yaml
+++ b/jjb/dcaegen2/dcaegen2-analytics-flink.yaml
@@ -4,6 +4,6 @@
project-name: dcaegen2-analytics-flink
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: dcaegen2/analytics/flink
branch: master
diff --git a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml
index 54a2942..817eead 100644
--- a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml
+++ b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml
@@ -6,37 +6,37 @@
- gerrit-maven-verify:
pre-build-script: !include-raw-escape: ../../shell/onap-gerrit-review-wrapper.sh
- gerrit-maven-merge:
- mvn-goals: 'clean install'
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
+ mvn-goals: "clean install"
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
- gerrit-maven-docker-stage:
build-node: ubuntu1804-docker-8c-8g
- mvn-goals: 'clean deploy docker:build -DpushImage'
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
+ mvn-goals: "clean deploy docker:build -DpushImage"
+ container-public-registry: "nexus3.onap.org:10001"
+ container-staging-registry: "nexus3.onap.org:10003"
- gerrit-maven-stage:
sign-artifacts: true
sbom-generator: true
- build-node: centos7-docker-8c-8g
+ build-node: centos8-docker-8c-8g
maven-versions-plugin: true
- project: 'dcaegen2/analytics/tca-gen2'
+ project: "dcaegen2/analytics/tca-gen2"
# job template iterators
- project-name: 'dcaegen2-analytics-tca-gen2'
+ project-name: "dcaegen2-analytics-tca-gen2"
stream:
- - 'master':
- branch: 'master'
- - 'kohn':
- branch: 'kohn'
+ - "master":
+ branch: "master"
+ - "london":
+ branch: "london"
java-version: openjdk11
- mvn-settings: 'dcaegen2-analytics-tca-gen2-settings'
- mvn-version: 'mvn35'
- maven-version: 'mvn35'
- mvn-snapshot-id: 'ecomp-snapshots'
- nexus-snapshot-repo: 'snapshots'
- files: '**'
+ mvn-settings: "dcaegen2-analytics-tca-gen2-settings"
+ mvn-version: "mvn35"
+ maven-version: "mvn35"
+ mvn-snapshot-id: "ecomp-snapshots"
+ nexus-snapshot-repo: "snapshots"
+ files: "**"
maven-deploy-properties: |
deployAtEnd=true
- archive-artifacts: ''
+ archive-artifacts: ""
build-node: ubuntu1804-docker-8c-8g
- project:
@@ -45,36 +45,35 @@
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
build-node: ubuntu1804-docker-8c-8g
- project: 'dcaegen2/analytics/tca-gen2'
- project-name: 'dcaegen2-analytics-tca-gen2'
- branch: 'master'
- mvn-settings: 'dcaegen2-analytics-tca-gen2-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
- mvn-version: 'mvn35'
- maven-version: 'mvn35'
+ project: "dcaegen2/analytics/tca-gen2"
+ project-name: "dcaegen2-analytics-tca-gen2"
+ branch: "master"
+ mvn-settings: "dcaegen2-analytics-tca-gen2-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
+ mvn-version: "mvn35"
+ maven-version: "mvn35"
- project:
name: dcaegen2-analytics-tca-gen2-clm
java-version: openjdk11
jobs:
- gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
+ nexus-iq-namespace: "onap-"
project: dcaegen2/analytics/tca-gen2
build-node: ubuntu1804-docker-8c-8g
- project-name: 'dcaegen2-analytics-tca-gen2'
+ project-name: "dcaegen2-analytics-tca-gen2"
stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'dcaegen2-analytics-tca-gen2-settings'
- mvn-version: 'mvn35'
- maven-version: 'mvn35'
+ - "master":
+ branch: "master"
+ mvn-settings: "dcaegen2-analytics-tca-gen2-settings"
+ mvn-version: "mvn35"
+ maven-version: "mvn35"
- project:
name: dcaegen2-analytics-tca-gen2-info
@@ -82,6 +81,6 @@
project-name: dcaegen2-analytics-tca-gen2
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: dcaegen2/analytics/tca-gen2
branch: master
diff --git a/jjb/dcaegen2/dcaegen2-analytics.yaml b/jjb/dcaegen2/dcaegen2-analytics.yaml
index 80ac689..aa66495 100644
--- a/jjb/dcaegen2/dcaegen2-analytics.yaml
+++ b/jjb/dcaegen2/dcaegen2-analytics.yaml
@@ -4,6 +4,6 @@
project-name: dcaegen2-analytics
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: dcaegen2/analytics
branch: master
diff --git a/jjb/dcaegen2/dcaegen2-collectors-datafile-csit.yaml b/jjb/dcaegen2/dcaegen2-collectors-datafile-csit.yaml
index 54f54db..4815e98 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-datafile-csit.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-datafile-csit.yaml
@@ -1,17 +1,18 @@
+---
- project:
name: dcaegen2-collectors-datafile-csit
jobs:
- - '{project-name}-{stream}-verify-csit-{functionality}'
- - '{project-name}-{stream}-csit-{functionality}'
- project-name: 'dcaegen2-collectors-datafile'
- recipients: 'vv770d@att.com lego@est.tech rajendra.jaiswal@ericsson.com'
+ - "{project-name}-{stream}-verify-csit-{functionality}"
+ - "{project-name}-{stream}-csit-{functionality}"
+ project-name: "dcaegen2-collectors-datafile"
+ recipients: "vv770d@att.com lego@est.tech rajendra.jaiswal@ericsson.com"
stream:
- - 'master':
- branch: 'master'
+ - "master":
+ branch: "master"
functionality:
- - 'ManagementInterface-suite':
+ - "ManagementInterface-suite":
trigger_jobs:
- - 'Functional-suite':
+ - "Functional-suite":
trigger_jobs:
- robot-options: ''
- branch: 'master'
+ robot-options: ""
+ branch: "master"
diff --git a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml
index 4a62b4d..33c1702 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml
@@ -2,80 +2,79 @@
- project:
name: dcaegen2-collectors-datafile
# job template iterators
- project-name: 'dcaegen2-collectors-datafile'
+ project-name: "dcaegen2-collectors-datafile"
stream:
- - 'master':
- branch: 'master'
- - 'kohn':
- branch: 'kohn'
+ - "master":
+ branch: "master"
+ - "london":
+ branch: "london"
java-version: openjdk11
# apply to all jobs
- project: 'dcaegen2/collectors/datafile'
- mvn-settings: 'dcaegen2-collectors-datafile-settings'
- files: '**'
+ project: "dcaegen2/collectors/datafile"
+ mvn-settings: "dcaegen2-collectors-datafile-settings"
+ files: "**"
maven-deploy-properties: |
deployAtEnd=true
- archive-artifacts: ''
+ archive-artifacts: ""
build-node: ubuntu1804-docker-8c-8g
- mvn-snapshot-id: 'ecomp-snapshots'
- nexus-snapshot-repo: 'snapshots'
+ mvn-snapshot-id: "ecomp-snapshots"
+ nexus-snapshot-repo: "snapshots"
jobs:
- gerrit-maven-verify:
pre-build-script: !include-raw-escape: ../../shell/onap-gerrit-review-wrapper.sh
- mvn-goals: 'clean install'
+ mvn-goals: "clean install"
- gerrit-maven-merge:
- mvn-goals: 'clean deploy'
+ mvn-goals: "clean deploy"
- gerrit-maven-stage:
sign-artifacts: true
sbom-generator: true
- build-node: centos7-docker-8c-8g
+ build-node: centos8-docker-8c-8g
maven-versions-plugin: true
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
- gerrit-maven-docker-stage:
build-node: ubuntu1804-docker-8c-8g
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
- mvn-goals: 'clean package docker:build -DpushImageTag'
+ container-public-registry: "nexus3.onap.org:10001"
+ container-staging-registry: "nexus3.onap.org:10003"
+ mvn-goals: "clean package docker:build -DpushImageTag"
- project:
name: dcaegen2-collectors-datafile-sonar
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
build-node: ubuntu1804-docker-8c-8g
- project: 'dcaegen2/collectors/datafile'
- project-name: 'dcaegen2-collectors-datafile'
- branch: 'master'
+ project: "dcaegen2/collectors/datafile"
+ project-name: "dcaegen2-collectors-datafile"
+ branch: "master"
java-version: openjdk11
- mvn-settings: 'dcaegen2-collectors-datafile-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ mvn-settings: "dcaegen2-collectors-datafile-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
- project:
name: dcaegen2-collectors-datafile-clm
jobs:
- gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
+ nexus-iq-namespace: "onap-"
project: dcaegen2/collectors/datafile
build-node: ubuntu1804-docker-8c-8g
- project-name: 'dcaegen2-collectors-datafile'
+ project-name: "dcaegen2-collectors-datafile"
stream:
- - 'master':
- branch: 'master'
+ - "master":
+ branch: "master"
java-version: openjdk11
- mvn-settings: 'dcaegen2-collectors-datafile-settings'
+ mvn-settings: "dcaegen2-collectors-datafile-settings"
- project:
name: dcaegen2-collectors-datafile-info
project-name: dcaegen2-collectors-datafile
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: dcaegen2/collectors/datafile
branch: master
diff --git a/jjb/dcaegen2/dcaegen2-collectors-hv-ves-csit.yaml b/jjb/dcaegen2/dcaegen2-collectors-hv-ves-csit.yaml
index 0a2921f..c7eb274 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-hv-ves-csit.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-hv-ves-csit.yaml
@@ -1,15 +1,16 @@
+---
- project:
name: dcaegen2-collectors-hv-ves-csit
jobs:
- - '{project-name}-{stream}-verify-csit-{functionality}'
- - '{project-name}-{stream}-csit-{functionality}'
- project-name: 'dcaegen2-collectors-hv-ves'
- recipients: 'vv770d@att.com piotr.wielebski@nokia.com kornel.janiak@nokia.com'
+ - "{project-name}-{stream}-verify-csit-{functionality}"
+ - "{project-name}-{stream}-csit-{functionality}"
+ project-name: "dcaegen2-collectors-hv-ves"
+ recipients: "vv770d@att.com piotr.wielebski@nokia.com kornel.janiak@nokia.com"
stream:
- - 'master':
- branch: 'master'
+ - "master":
+ branch: "master"
functionality:
- - 'testsuites':
+ - "testsuites":
trigger_jobs:
- - '{project-name}-{stream}-merge-java'
- robot-options: ''
+ - "{project-name}-{stream}-merge-java"
+ robot-options: ""
diff --git a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
index c7e79bd..fbf007d 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
@@ -2,42 +2,42 @@
- project:
name: dcaegen2-collectors-hv-ves
# job template iterators
- project-name: 'dcaegen2-collectors-hv-ves'
+ project-name: "dcaegen2-collectors-hv-ves"
stream:
- - 'master':
- branch: 'master'
- - 'kohn':
- branch: 'kohn'
+ - "master":
+ branch: "master"
+ - "london":
+ branch: "london"
# apply to all jobs
java-version: openjdk11
- project: 'dcaegen2/collectors/hv-ves'
- mvn-settings: 'dcaegen2-collectors-hv-ves-settings'
- files: '**'
+ project: "dcaegen2/collectors/hv-ves"
+ mvn-settings: "dcaegen2-collectors-hv-ves-settings"
+ files: "**"
maven-deploy-properties: |
deployAtEnd=true
- archive-artifacts: 'hv-collector-coverage/target/site/jacoco-aggregate,**/target/reports/detekt-report.html'
- mvn-snapshot-id: 'ecomp-snapshots'
- nexus-snapshot-repo: 'snapshots'
+ archive-artifacts: "hv-collector-coverage/target/site/jacoco-aggregate,**/target/reports/detekt-report.html"
+ mvn-snapshot-id: "ecomp-snapshots"
+ nexus-snapshot-repo: "snapshots"
build-node: ubuntu1804-docker-8c-8g
jobs:
- gerrit-maven-verify:
pre-build-script: !include-raw-escape: ../../shell/onap-gerrit-review-wrapper.sh
- mvn-goals: 'clean install'
+ mvn-goals: "clean install"
- gerrit-maven-merge:
- mvn-goals: 'clean deploy'
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
+ mvn-goals: "clean deploy"
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
- gerrit-maven-stage:
sign-artifacts: true
sbom-generator: true
- build-node: centos7-docker-8c-8g
+ build-node: centos8-docker-8c-8g
maven-versions-plugin: true
- mvn-goals: 'clean deploy -Ddocker.skip'
+ mvn-goals: "clean deploy -Ddocker.skip"
- gerrit-maven-docker-stage:
build-node: ubuntu1804-docker-8c-8g
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
- mvn-params: '-DskipNexusStagingDeployMojo=true -DskipDockerPush=false'
+ container-public-registry: "nexus3.onap.org:10001"
+ container-staging-registry: "nexus3.onap.org:10003"
+ mvn-params: "-DskipNexusStagingDeployMojo=true -DskipDockerPush=false"
- project:
name: dcaegen2-collectors-hv-ves-sonar
@@ -45,39 +45,37 @@
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
build-node: ubuntu1804-docker-8c-8g
- project: 'dcaegen2/collectors/hv-ves'
- project-name: 'dcaegen2-collectors-hv-ves'
- branch: 'master'
- mvn-settings: 'dcaegen2-collectors-hv-ves-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ project: "dcaegen2/collectors/hv-ves"
+ project-name: "dcaegen2-collectors-hv-ves"
+ branch: "master"
+ mvn-settings: "dcaegen2-collectors-hv-ves-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
- project:
name: dcaegen2-collectors-hv-ves-clm
java-version: openjdk11
jobs:
- gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
+ nexus-iq-namespace: "onap-"
project: dcaegen2/collectors/hv-ves
- project-name: 'dcaegen2-collectors-hv-ves'
+ project-name: "dcaegen2-collectors-hv-ves"
stream:
- - 'master':
- branch: 'master'
+ - "master":
+ branch: "master"
build-node: ubuntu1804-docker-8c-8g
- mvn-settings: 'dcaegen2-collectors-hv-ves-settings'
-
+ mvn-settings: "dcaegen2-collectors-hv-ves-settings"
- project:
name: dcaegen2-collectors-hv-ves-info
project-name: dcaegen2-collectors-hv-ves
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: dcaegen2/collectors/hv-ves
branch: master
diff --git a/jjb/dcaegen2/dcaegen2-collectors-restconf-csit.yaml b/jjb/dcaegen2/dcaegen2-collectors-restconf-csit.yaml
index 31db44a..1e93535 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-restconf-csit.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-restconf-csit.yaml
@@ -1,15 +1,16 @@
+---
- project:
name: dcaegen2-collectors-restconf-csit
jobs:
- - '{project-name}-{stream}-verify-csit-{functionality}'
- - '{project-name}-{stream}-csit-{functionality}'
- project-name: 'dcaegen2-collectors-restconf'
- recipients: 'vv770d@att.com swarup.nayak1@huawei.com'
+ - "{project-name}-{stream}-verify-csit-{functionality}"
+ - "{project-name}-{stream}-csit-{functionality}"
+ project-name: "dcaegen2-collectors-restconf"
+ recipients: "vv770d@att.com swarup.nayak1@huawei.com"
stream:
- - 'master':
- branch: 'master'
+ - "master":
+ branch: "master"
functionality:
- - 'testsuites':
+ - "testsuites":
trigger_jobs:
- - '{project-name}-{stream}-merge-java'
- robot-options: ''
+ - "{project-name}-{stream}-merge-java"
+ robot-options: ""
diff --git a/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml b/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml
index 25814ac..8e4db3c 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml
@@ -1,7 +1,7 @@
---
- project:
name: dcaegen2-collectors-restconf
- project-name: 'dcaegen2-collectors-restconf'
+ project-name: "dcaegen2-collectors-restconf"
java-version: openjdk11
jobs:
- gerrit-maven-verify:
@@ -10,32 +10,32 @@
- gerrit-maven-stage:
sign-artifacts: true
sbom-generator: true
- build-node: centos7-docker-8c-8g
+ build-node: centos8-docker-8c-8g
maven-versions-plugin: true
- gerrit-maven-docker-stage:
build-node: ubuntu1804-docker-8c-8g
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
- mvn-goals: 'clean package docker:build -DpushImageTag'
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
- project: 'dcaegen2/collectors/restconf'
+ container-public-registry: "nexus3.onap.org:10001"
+ container-staging-registry: "nexus3.onap.org:10003"
+ mvn-goals: "clean package docker:build -DpushImageTag"
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
+ project: "dcaegen2/collectors/restconf"
stream:
- - 'master':
- branch: 'master'
- - 'kohn':
- branch: 'kohn'
- mvn-snapshot-id: 'ecomp-snapshots'
- nexus-snapshot-repo: 'snapshots'
- mvn-settings: 'dcaegen2-collectors-restconf-settings'
+ - "master":
+ branch: "master"
+ - "london":
+ branch: "london"
+ mvn-snapshot-id: "ecomp-snapshots"
+ nexus-snapshot-repo: "snapshots"
+ mvn-settings: "dcaegen2-collectors-restconf-settings"
# due to a strange macro / variable translation problem this needs
# to be passed as a string block to properly get the properties
# correctly defined in the job
maven-deploy-properties: |
deployAtEnd=true
- files: '**'
- archive-artifacts: ''
- build-node: 'ubuntu1804-docker-8c-8g'
+ files: "**"
+ archive-artifacts: ""
+ build-node: "ubuntu1804-docker-8c-8g"
- project:
name: dcaegen2-collectors-restconf-sonar
@@ -43,32 +43,31 @@
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
build-node: ubuntu1804-docker-8c-8g
- project: 'dcaegen2/collectors/restconf'
- project-name: 'dcaegen2-collectors-restconf'
- branch: 'master'
- mvn-settings: 'dcaegen2-collectors-restconf-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ project: "dcaegen2/collectors/restconf"
+ project-name: "dcaegen2-collectors-restconf"
+ branch: "master"
+ mvn-settings: "dcaegen2-collectors-restconf-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
- project:
name: dcaegen2-collectors-restconf-clm
java-version: openjdk11
jobs:
- gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
+ nexus-iq-namespace: "onap-"
project: dcaegen2/collectors/restconf
build-node: ubuntu1804-docker-8c-8g
- project-name: 'dcaegen2-collectors-restconf'
+ project-name: "dcaegen2-collectors-restconf"
stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'dcaegen2-collectors-restconf-settings'
+ - "master":
+ branch: "master"
+ mvn-settings: "dcaegen2-collectors-restconf-settings"
- project:
name: dcaegen2-collectors-restconf-info
@@ -76,6 +75,6 @@
java-version: openjdk11
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: dcaegen2/collectors/restconf
branch: master
diff --git a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
index 8442817..ee55540 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
@@ -1,59 +1,57 @@
---
- project:
name: dcaegen2-collectors-snmptrap
- project-name: 'dcaegen2-collectors-snmptrap'
- project: 'dcaegen2/collectors/snmptrap'
+ project-name: "dcaegen2-collectors-snmptrap"
+ project: "dcaegen2/collectors/snmptrap"
python-version: python3
- tox-dir: '.'
+ tox-dir: "."
stream:
- - 'master':
- branch: 'master'
- - 'kohn':
- branch: 'kohn'
+ - "master":
+ branch: "master"
+ - "london":
+ branch: "london"
build-node: ubuntu1804-docker-8c-8g
- mvn-settings: 'dcaegen2-collectors-snmptrap-settings'
+ mvn-settings: "dcaegen2-collectors-snmptrap-settings"
jobs:
- - '{project-name}-python-jobs':
- pre-build-script: !include-raw-escape: ../../shell/onap-gerrit-review-wrapper.sh
- - '{project-name}-{stream}-release-version-java-daily'
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
- archive-artifacts: ''
+ - "{project-name}-python-jobs":
+ pre-build-script: !include-raw-escape: ../../shell/onap-gerrit-review-wrapper.sh
+ - "{project-name}-{stream}-release-version-java-daily"
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
+ archive-artifacts: ""
container-tag-method: latest
- nexus-iq-namespace: 'onap-'
+ nexus-iq-namespace: "onap-"
gerrit_trigger_file_paths:
- compare-type: REG_EXP
- pattern: '.*'
+ pattern: ".*"
maven-deploy-properties: |
deployAtEnd=true
- mvn-snapshot-id: 'ecomp-snapshots'
- nexus-snapshot-repo: 'snapshots'
- files: '**'
-
+ mvn-snapshot-id: "ecomp-snapshots"
+ nexus-snapshot-repo: "snapshots"
+ files: "**"
- project:
name: dcaegen2-collectors-snmptrap-sonar
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
build-node: ubuntu1804-builder-4c-4g
- project: 'dcaegen2/collectors/snmptrap'
- project-name: 'dcaegen2-collectors-snmptrap'
- branch: 'master'
- mvn-settings: 'dcaegen2-collectors-snmptrap-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ project: "dcaegen2/collectors/snmptrap"
+ project-name: "dcaegen2-collectors-snmptrap"
+ branch: "master"
+ mvn-settings: "dcaegen2-collectors-snmptrap-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
- project:
name: dcaegen2-collectors-snmptrap-info
project-name: dcaegen2-collectors-snmptrap
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: dcaegen2/collectors/snmptrap
branch: master
diff --git a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
index cf39afe..22f7f22 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
@@ -1,7 +1,7 @@
---
- project:
name: dcaegen2-collectors-ves
- project-name: 'dcaegen2-collectors-ves'
+ project-name: "dcaegen2-collectors-ves"
java-version: openjdk11
jobs:
- gerrit-maven-verify:
@@ -16,30 +16,30 @@
maven-versions-plugin: true
- gerrit-maven-docker-stage:
build-node: ubuntu1804-docker-8c-8g
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
- mvn-goals: 'clean package docker:build -DpushImageTag'
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
+ container-public-registry: "nexus3.onap.org:10001"
+ container-staging-registry: "nexus3.onap.org:10003"
+ mvn-goals: "clean package docker:build -DpushImageTag"
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
- project: 'dcaegen2/collectors/ves'
+ project: "dcaegen2/collectors/ves"
stream:
- - 'master':
- branch: 'master'
- - 'kohn':
- branch: 'kohn'
- mvn-settings: 'dcaegen2-collectors-ves-settings'
+ - "master":
+ branch: "master"
+ - "london":
+ branch: "london"
+ mvn-settings: "dcaegen2-collectors-ves-settings"
# due to a strange macro / variable translation problem this needs
# to be passed as a string block to properly get the properties
# correctly defined in the job
maven-deploy-properties: |
deployAtEnd=true
- files: '**'
- archive-artifacts: ''
- build-node: 'ubuntu1804-docker-8c-8g'
- mvn-snapshot-id: 'ecomp-snapshots'
- mvn-version: 'mvn36'
- nexus-snapshot-repo: 'snapshots'
+ files: "**"
+ archive-artifacts: ""
+ build-node: "ubuntu1804-docker-8c-8g"
+ mvn-snapshot-id: "ecomp-snapshots"
+ mvn-version: "mvn36"
+ nexus-snapshot-repo: "snapshots"
- project:
name: dcaegen2-collectors-ves-sonar
@@ -47,38 +47,37 @@
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
build-node: ubuntu1804-docker-8c-8g
- project: 'dcaegen2/collectors/ves'
- project-name: 'dcaegen2-collectors-ves'
- branch: 'master'
- mvn-settings: 'dcaegen2-collectors-ves-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ project: "dcaegen2/collectors/ves"
+ project-name: "dcaegen2-collectors-ves"
+ branch: "master"
+ mvn-settings: "dcaegen2-collectors-ves-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
- project:
name: dcaegen2-collectors-ves-clm
java-version: openjdk11
jobs:
- gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
+ nexus-iq-namespace: "onap-"
project: dcaegen2/collectors/ves
build-node: ubuntu1804-docker-8c-8g
- project-name: 'dcaegen2-collectors-ves'
+ project-name: "dcaegen2-collectors-ves"
stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'dcaegen2-collectors-ves-settings'
+ - "master":
+ branch: "master"
+ mvn-settings: "dcaegen2-collectors-ves-settings"
- project:
name: dcaegen2-collectors-ves-info
project-name: dcaegen2-collectors-ves
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: dcaegen2/collectors/ves
branch: master
diff --git a/jjb/dcaegen2/dcaegen2-collectors.yaml b/jjb/dcaegen2/dcaegen2-collectors.yaml
index b695e9e..6c50f2f 100644
--- a/jjb/dcaegen2/dcaegen2-collectors.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors.yaml
@@ -4,6 +4,6 @@
project-name: dcaegen2-collectors
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: dcaegen2/collectors
branch: master
diff --git a/jjb/dcaegen2/dcaegen2-deployments.yaml b/jjb/dcaegen2/dcaegen2-deployments.yaml
index b034846..0b83a6e 100644
--- a/jjb/dcaegen2/dcaegen2-deployments.yaml
+++ b/jjb/dcaegen2/dcaegen2-deployments.yaml
@@ -1,50 +1,50 @@
---
- project:
name: dcaegen2-deployments
- project-name: 'dcaegen2-deployments'
+ project-name: "dcaegen2-deployments"
jobs:
- gerrit-maven-verify:
pre-build-script: !include-raw-escape: ../../shell/onap-gerrit-review-wrapper.sh
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
- - '{project-name}-{stream}-release-version-java-daily'
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
- project: 'dcaegen2/deployments'
+ - "{project-name}-{stream}-verify-java"
+ - "{project-name}-{stream}-merge-java"
+ - "{project-name}-{stream}-release-version-java-daily"
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
+ project: "dcaegen2/deployments"
stream:
- - 'master':
- branch: 'master'
- - 'kohn':
- branch: 'kohn'
- mvn-settings: 'dcaegen2-deployments-settings'
- mvn-snapshot-id: 'ecomp-snapshots'
- nexus-snapshot-repo: 'snapshots'
+ - "master":
+ branch: "master"
+ - "london":
+ branch: "london"
+ mvn-settings: "dcaegen2-deployments-settings"
+ mvn-snapshot-id: "ecomp-snapshots"
+ nexus-snapshot-repo: "snapshots"
# due to a strange macro / variable translation problem this needs
# to be passed as a string block to properly get the properties
# correctly defined in the job
maven-deploy-properties: |
deployAtEnd=true
- files: '**'
- archive-artifacts: ''
- build-node: 'ubuntu1804-docker-v1-8c-8g'
+ files: "**"
+ archive-artifacts: ""
+ build-node: "ubuntu1804-docker-v1-8c-8g"
build-timeout: 180
- project:
name: dcaegen2-deployments-clm
jobs:
- gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
+ nexus-iq-namespace: "onap-"
build-node: ubuntu1804-docker-8c-8g
project: dcaegen2/deployments
- project-name: 'dcaegen2-deployments'
- branch: 'master'
- mvn-settings: 'dcaegen2-deployments-settings'
+ project-name: "dcaegen2-deployments"
+ branch: "master"
+ mvn-settings: "dcaegen2-deployments-settings"
- project:
name: dcaegen2-deployments-info
project-name: dcaegen2-deployments
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: dcaegen2/deployments
branch: master
diff --git a/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml b/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml
deleted file mode 100644
index bb70341..0000000
--- a/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml
+++ /dev/null
@@ -1,108 +0,0 @@
----
-- job-group:
- # This job group contains all the jobs that should be deployed for
- # a subproject of dcaegen2/platform that builds a Docker image from
- # Python code.
- #
- # Required parameters:
- # build-node: The node to run build on.
- # mvn-settings: Maven settings.xml file containing credentials to use.
- # project-name: The job name prefix
- # src-dir: The subdirectory of the repository containing subproject code
- # stream: The stream to build
- # branch: The branch to build
- #
- # Note: Multiple subprojects can be built with a single JJB project
- # by specifying the value of project-name as a list.
- # Similarly, multiple streams can be built with a single JJB project
- # by specifying the value of the stream as a list.
- # For example:
- # project-name:
- # - subproject-name1:
- # src-dir: subproject-dir1
- # docker-name: onap/org.onap.dcaegen2.platform.something.name1
- # - subproject-name2:
- # src-dir: subproject-dir2
- # docker-name: onap/org.onap.dcaegen2.platform.something.name2
- # - subproject-name3:
- # src-dir: subproject-dir3
- # docker-name: onap/org.onap.dcaegen2.platform.something.name3
- # stream:
- # - master:
- # branch: master
- # - release1:
- # branch: release1.0
- # jobs:
- # - dcaegen2-docker-python-jobs
-
- name: '{project-name}-dcaegen2-docker-python-jobs'
- id: dcaegen2-docker-python-jobs
- container-tag-method: latest
- docker-get-container-tag-script: ../../shell/docker-ts-tag-override.sh
- nexus-iq-namespace: 'onap-'
- tox-dir: '{src-dir}'
- docker-root: '{src-dir}'
- gerrit_trigger_file_paths:
- - compare-type: REG_EXP
- pattern: '{src-dir}/.*'
- jobs:
- - gerrit-tox-verify:
- pre-build-script: !include-raw-escape: ../../shell/onap-gerrit-review-wrapper.sh
- stream: all
- branch: '*'
- - gerrit-docker-verify
- - gerrit-docker-merge:
- post_docker_build_script: |
- #!/bin/bash
- set -uex -o pipefail
- DOCKER_IMAGE_TAG2=${{DOCKER_IMAGE_TAG%-*}}
- DNAME={container-snapshot-registry}/{docker-name}
- docker tag $DNAME:$DOCKER_IMAGE_TAG $DNAME:$DOCKER_IMAGE_TAG2
- docker tag $DNAME:$DOCKER_IMAGE_TAG $DNAME:latest
- docker push $DNAME:$DOCKER_IMAGE_TAG2
- docker push $DNAME:latest
-
- - gerrit-maven-clm:
- mvn-params: '-f {src-dir}'
- stream: master
- branch: master
- - gerrit-tox-sonar:
- # workaround because gerrit-tox-sonar doesn't support mvn-params/opts
- sonar-mvn-goal: '-f {src-dir} sonar:sonar'
- cron: '@daily'
- stream: master
- branch: master
- sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
-
-
-- project:
- name: dcaegen2-platform-docker-python-subprojects
- project: dcaegen2/platform
- mvn-settings: dcaegen2-platform-settings
- build-node: ubuntu1804-docker-8c-8g
- project-name:
- - dcaegen2-platform-adapter-acumos:
- src-dir: adapter/acumos
- docker-name: onap/org.onap.dcaegen2.platform.adapter.acumos
- - dcaegen2-platform-mod-distributorapi:
- src-dir: mod/distributorapi
- docker-name: onap/org.onap.dcaegen2.platform.mod.distributorapi
- - dcaegen2-platform-mod-onboardingapi:
- src-dir: mod/onboardingapi
- docker-name: onap/org.onap.dcaegen2.platform.mod.onboardingapi
- stream:
- - master:
- branch: master
- - kohn:
- branch: kohn
-
- views:
- - project-view:
- project-name: dcaegen2-platform-adapter
- - project-view:
- project-name: dcaegen2-platform-mod
- jobs:
- - dcaegen2-docker-python-jobs
diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml
deleted file mode 100644
index 0920ead..0000000
--- a/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml
+++ /dev/null
@@ -1,50 +0,0 @@
----
-- project:
- name: dcaegen2-platform-mod-designtool
- project-name: dcaegen2-platform-mod-designtool
- # git repo
- project: dcaegen2/platform
- jobs:
- - gerrit-maven-verify:
- pre-build-script: !include-raw-escape: ../../shell/onap-gerrit-review-wrapper.sh
- - gerrit-maven-merge
- - gerrit-maven-stage:
- sign-artifacts: true
- sbom-generator: true
- sbom-path: 'mod/designtool/'
- maven-versions-plugin: true
- version-properties-file: 'mod/designtool/version.properties'
- mvn-pom: 'mod/designtool/pom.xml'
- stream:
- - 'master':
- branch: 'master'
- - 'kohn':
- branch: 'kohn'
- mvn-settings: dcaegen2-platform-settings
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
- gerrit_trigger_file_paths:
- - compare-type: ANT
- pattern: 'mod/designtool/**'
- mvn-goals: 'clean package install'
- mvn-params: '-f mod/designtool/pom.xml'
- pattern: 'mod/designtool/**'
- mvn-snapshot-id: 'ecomp-snapshots'
- nexus-snapshot-repo: 'snapshots'
- files: '**'
- archive-artifacts: ''
- build-node: ubuntu1804-docker-8c-8g
-
-
-- project:
- name: dcaegen2-platform-mod-designtool-clm
- jobs:
- - gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
- project: dcaegen2/platform
- build-node: ubuntu1804-docker-8c-8g
- project-name: 'dcaegen2-platform-mod-designtool'
- stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'dcaegen2-platform-settings'
diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml
deleted file mode 100644
index a47fe52..0000000
--- a/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml
+++ /dev/null
@@ -1,70 +0,0 @@
----
-- project:
- name: dcaegen2-platform-mod-genprocessor
- project-name: dcaegen2-platform-mod-genprocessor
- # git repo
- project: dcaegen2/platform
- jobs:
- - gerrit-maven-verify:
- pre-build-script: !include-raw-escape: ../../shell/onap-gerrit-review-wrapper.sh
- - gerrit-maven-merge
- - gerrit-maven-stage:
- sign-artifacts: true
- sbom-generator: true
- sbom-path: 'mod/runtimeapi/'
- maven-versions-plugin: true
- version-properties-file: 'mod/genprocessor/version.properties'
- mvn-pom: 'mod/genprocessor/pom.xml'
- stream:
- - 'master':
- branch: 'master'
- - 'kohn':
- branch: 'kohn'
- mvn-settings: dcaegen2-platform-settings
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
- mvn-goals: 'clean package install'
- mvn-params: '-f mod/genprocessor/pom.xml'
- gerrit_trigger_file_paths:
- - compare-type: ANT
- pattern: 'mod/genprocessor/**'
- pattern: 'mod/genprocessor/**'
- mvn-snapshot-id: 'ecomp-snapshots'
- nexus-snapshot-repo: 'snapshots'
- files: '**'
- archive-artifacts: ''
- build-node: ubuntu1804-docker-8c-8g
-
-- project:
- name: dcaegen2-platform-mod-genprocessor-sonar
- jobs:
- - gerrit-maven-sonar
- sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
- build-node: ubuntu1804-docker-8c-8g
- project: 'dcaegen2/platform'
- project-name: 'dcaegen2-platform-mod-genprocessor'
- branch: 'master'
- mvn-settings: 'dcaegen2-platform-settings'
- mvn-params: '-f mod/genprocessor/pom.xml'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- project:
- name: dcaegen2-platform-mod-genprocessor-clm
- jobs:
- - gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
- build-node: ubuntu1804-docker-8c-8g
- project: 'dcaegen2/platform'
- project-name: dcaegen2-platform-mod-genprocessor-clm
- mvn-params: '-f mod/genprocessor/pom.xml'
- stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'dcaegen2-platform-settings'
-
diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-runtimeapi.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-runtimeapi.yaml
deleted file mode 100644
index d458fb7..0000000
--- a/jjb/dcaegen2/dcaegen2-platform-mod-runtimeapi.yaml
+++ /dev/null
@@ -1,72 +0,0 @@
----
-- project:
- name: dcaegen2-platform-mod-runtimeapi
- project-name: dcaegen2-platform-mod-runtimeapi
- # git repo
- project: dcaegen2/platform
- jobs:
- - gerrit-maven-verify:
- pre-build-script: !include-raw-escape: ../../shell/onap-gerrit-review-wrapper.sh
- - gerrit-maven-merge
- - gerrit-maven-stage:
- sign-artifacts: true
- sbom-generator: true
- sbom-path: 'mod/runtimeapi/'
- maven-versions-plugin: true
- version-properties-file: 'mod/runtimeapi/version.properties'
- mvn-pom: 'mod/runtimeapi/pom.xml'
- stream:
- - 'master':
- branch: 'master'
- - 'kohn':
- branch: 'kohn'
- java-version: openjdk11
- mvn-settings: dcaegen2-platform-settings
- gerrit_trigger_file_paths:
- - compare-type: ANT
- pattern: 'mod/runtimeapi/**'
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
- mvn-goals: 'clean package install'
- mvn-params: '-f mod/runtimeapi/pom.xml'
- pattern: 'mod/runtimeapi/**'
- mvn-snapshot-id: 'ecomp-snapshots'
- nexus-snapshot-repo: 'snapshots'
- files: '**'
- archive-artifacts: ''
- build-node: ubuntu1804-docker-8c-8g
-
-- project:
- name: dcaegen2-platform-mod-runtimeapi-sonar
- java-version: openjdk11
- jobs:
- - gerrit-maven-sonar
- sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
- build-node: ubuntu1804-docker-8c-8g
- project: 'dcaegen2/platform'
- project-name: 'dcaegen2-platform-mod-runtimeapi'
- branch: 'master'
- mvn-settings: 'dcaegen2-platform-settings'
- mvn-params: '-f mod/runtimeapi/pom.xml'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- project:
- name: dcaegen2-platform-mod-runtimeapi-clm
- java-version: openjdk11
- jobs:
- - gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
- build-node: ubuntu1804-docker-8c-8g
- project: 'dcaegen2/platform'
- project-name: dcaegen2-platform-mod-runtimeapi-clm
- mvn-params: '-f mod/runtimeapi/pom.xml'
- stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'dcaegen2-platform-settings'
diff --git a/jjb/dcaegen2/dcaegen2-platform-mod2-helm-generator.yaml b/jjb/dcaegen2/dcaegen2-platform-mod2-helm-generator.yaml
deleted file mode 100644
index bff0e01..0000000
--- a/jjb/dcaegen2/dcaegen2-platform-mod2-helm-generator.yaml
+++ /dev/null
@@ -1,75 +0,0 @@
----
-- project:
- name: dcaegen2-platform-mod2-helm-generator
- project-name: dcaegen2-platform-mod2-helm-generator
- # git repo
- project: dcaegen2/platform
- jobs:
- - gerrit-maven-verify:
- pre-build-script: !include-raw-escape: ../../shell/onap-gerrit-review-wrapper.sh
- - gerrit-maven-merge
- - gerrit-maven-stage:
- sign-artifacts: true
- sbom-generator: true
- sbom-path: 'mod2/helm-generator/'
- build-node: centos7-builder-4c-4g
- maven-versions-plugin: true
- version-properties-file: 'mod2/helm-generator/version.properties'
- mvn-pom: 'mod2/helm-generator/pom.xml'
- stream:
- - 'master':
- branch: 'master'
- - 'kohn':
- branch: 'kohn'
- java-version: openjdk11
- mvn-settings: dcaegen2-platform-settings
- gerrit_trigger_file_paths:
- - compare-type: ANT
- pattern: 'mod2/helm-generator/**'
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
- mvn-params: '-f mod2/helm-generator/pom.xml'
- pattern: 'mod2/helm-generator/**'
- mvn-snapshot-id: 'ecomp-snapshots'
- nexus-snapshot-repo: 'snapshots'
- maven-version: 'mvn35'
- maven-deploy-properties: |
- deployAtEnd=true
- files: '**'
- archive-artifacts: ''
- build-node: ubuntu1804-docker-8c-8g
-
-- project:
- name: dcaegen2-platform-mod2-helm-generator-sonar
- java-version: openjdk11
- jobs:
- - gerrit-maven-sonar
- sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
- build-node: ubuntu1804-docker-8c-8g
- project: 'dcaegen2/platform'
- project-name: 'dcaegen2-platform-mod2-helm-generator'
- branch: 'master'
- mvn-settings: 'dcaegen2-platform-settings'
- mvn-params: '-f mod2/helm-generator/pom.xml'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- project:
- name: dcaegen2-platform-mod2-helm-generator-clm
- java-version: openjdk11
- jobs:
- - gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
- build-node: ubuntu1804-docker-8c-8g
- project: 'dcaegen2/platform'
- project-name: dcaegen2-platform-mod2-helm-generator
- mvn-params: '-f mod2/helm-generator/pom.xml'
- stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'dcaegen2-platform-settings'
diff --git a/jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml b/jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml
index 6ca3f3d..f226ac8 100644
--- a/jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml
@@ -1,76 +1,74 @@
---
- project:
- name: dcaegen2-platform-ves-openapi-manager
- project-name: 'dcaegen2-platform-ves-openapi-manager'
- java-version: openjdk11
- jobs:
- - gerrit-maven-verify:
- pre-build-script: !include-raw-escape: ../../shell/onap-gerrit-review-wrapper.sh
- - gerrit-maven-merge
- - gerrit-maven-stage:
- sign-artifacts: true
- build-node: centos7-docker-8c-8g
- maven-versions-plugin: true
- sbom-generator: true
- - gerrit-maven-docker-stage:
- build-node: ubuntu1804-docker-8c-8g
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
- mvn-goals: 'clean package docker:build docker:push'
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
+ name: dcaegen2-platform-ves-openapi-manager
+ project-name: "dcaegen2-platform-ves-openapi-manager"
+ java-version: openjdk11
+ jobs:
+ - gerrit-maven-verify:
+ pre-build-script: !include-raw-escape: ../../shell/onap-gerrit-review-wrapper.sh
+ - gerrit-maven-merge
+ - gerrit-maven-stage:
+ sign-artifacts: true
+ build-node: centos8-docker-8c-8g
+ maven-versions-plugin: true
+ sbom-generator: true
+ - gerrit-maven-docker-stage:
+ build-node: ubuntu1804-docker-8c-8g
+ container-public-registry: "nexus3.onap.org:10001"
+ container-staging-registry: "nexus3.onap.org:10003"
+ mvn-goals: "clean package docker:build docker:push"
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
- project: 'dcaegen2/platform/ves-openapi-manager'
- stream:
- - 'master':
- branch: 'master'
- - 'kohn':
- branch: 'kohn'
- mvn-settings: 'dcaegen2-platform-ves-openapi-manager-settings'
- mvn-snapshot-id: 'ecomp-snapshots'
- nexus-snapshot-repo: 'snapshots'
- # due to a strange macro / variable translation problem this needs
- # to be passed as a string block to properly get the properties
- # correctly defined in the job
- maven-deploy-properties: |
- deployAtEnd=true
- files: '**'
- archive-artifacts: ''
- build-node: 'ubuntu1804-docker-8c-8g'
+ project: "dcaegen2/platform/ves-openapi-manager"
+ stream:
+ - "master":
+ branch: "master"
+ - "london":
+ branch: "london"
+ mvn-settings: "dcaegen2-platform-ves-openapi-manager-settings"
+ mvn-snapshot-id: "ecomp-snapshots"
+ nexus-snapshot-repo: "snapshots"
+ # due to a strange macro / variable translation problem this needs
+ # to be passed as a string block to properly get the properties
+ # correctly defined in the job
+ maven-deploy-properties: |
+ deployAtEnd=true
+ files: "**"
+ archive-artifacts: ""
+ build-node: "ubuntu1804-docker-8c-8g"
- project:
- name: dcaegen2-platform-ves-openapi-sonar
- java-version: openjdk11
- jobs:
- - gerrit-maven-sonar
- sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
- build-node: ubuntu1804-docker-8c-8g
- project: 'dcaegen2/platform/ves-openapi-manager'
- project-name: 'dcaegen2-platform-ves-openapi-manager'
- branch: 'master'
- mvn-settings: 'dcaegen2-platform-ves-openapi-manager-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ name: dcaegen2-platform-ves-openapi-sonar
+ java-version: openjdk11
+ jobs:
+ - gerrit-maven-sonar
+ sonarcloud: true
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
+ build-node: ubuntu1804-docker-8c-8g
+ project: "dcaegen2/platform/ves-openapi-manager"
+ project-name: "dcaegen2-platform-ves-openapi-manager"
+ branch: "master"
+ mvn-settings: "dcaegen2-platform-ves-openapi-manager-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
- project:
name: dcaegen2-platform-ves-openapi-clm
java-version: openjdk11
jobs:
- gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
+ nexus-iq-namespace: "onap-"
project: dcaegen2/platform/ves-openapi-manager
build-node: ubuntu1804-docker-8c-8g
- project-name: 'dcaegen2-platform-ves-openapi-manager'
+ project-name: "dcaegen2-platform-ves-openapi-manager"
stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'dcaegen2-platform-ves-openapi-manager-settings'
-
+ - "master":
+ branch: "master"
+ mvn-settings: "dcaegen2-platform-ves-openapi-manager-settings"
- project:
name: dcaegen2-platform-ves-openapi-manager-project-view
@@ -82,6 +80,6 @@
name: dcaegen2-platform-ves-openapi-manager-info
project: dcaegen2/platform/ves-openapi-manager
project-name: dcaegen2-platform-ves-openapi-manager
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
jobs:
- gerrit-info-yaml-verify
diff --git a/jjb/dcaegen2/dcaegen2-platform.yaml b/jjb/dcaegen2/dcaegen2-platform.yaml
index 23d22ed..fc0a4b9 100644
--- a/jjb/dcaegen2/dcaegen2-platform.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform.yaml
@@ -4,7 +4,7 @@
project-name: dcaegen2-platform
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: dcaegen2/platform
branch: master
@@ -13,7 +13,7 @@
project-name: dcaegen2-platform
mvn-settings: dcaegen2-platform-settings
jobs:
- - '{project-name}-gerrit-release-jobs'
- build-node: centos7-docker-8c-8g
+ - "{project-name}-gerrit-release-jobs"
+ build-node: centos7-docker-2c-1g
project: dcaegen2/platform
branch: master
diff --git a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml
index f843ba6..0b091d6 100644
--- a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml
@@ -1,138 +1,138 @@
---
- project:
name: dcaegen2-services-datalake-handler
- project: 'dcaegen2/services'
- project-name: 'dcaegen2-services-datalake-handler'
+ project: "dcaegen2/services"
+ project-name: "dcaegen2-services-datalake-handler"
jobs:
- gerrit-maven-verify:
pre-build-script: !include-raw-escape: ../../shell/onap-gerrit-review-wrapper.sh
- gerrit-maven-merge
stream:
- - 'master':
- branch: 'master'
- - 'kohn':
- branch: 'kohn'
+ - "master":
+ branch: "master"
+ - "london":
+ branch: "london"
java-version: openjdk11
- maven-version: 'mvn35'
- mvn-settings: 'dcaegen2-services-settings'
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
- mvn-params: '-f components/datalake-handler/pom.xml'
+ maven-version: "mvn35"
+ mvn-settings: "dcaegen2-services-settings"
+ container-public-registry: "nexus3.onap.org:10001"
+ container-staging-registry: "nexus3.onap.org:10003"
+ mvn-params: "-f components/datalake-handler/pom.xml"
gerrit_trigger_file_paths:
- compare-type: ANT
- pattern: 'components/datalake-handler/**'
- mvn-snapshot-id: 'ecomp-snapshots'
- nexus-snapshot-repo: 'snapshots'
+ pattern: "components/datalake-handler/**"
+ mvn-snapshot-id: "ecomp-snapshots"
+ nexus-snapshot-repo: "snapshots"
maven-deploy-properties: |
deployAtEnd=true
- files: '**'
- archive-artifacts: ''
- build-node: 'ubuntu1804-docker-8c-8g'
+ files: "**"
+ archive-artifacts: ""
+ build-node: "ubuntu1804-docker-8c-8g"
- project:
name: dcaegen2-services-datalake-handler-release
- project: 'dcaegen2/services'
- project-name: 'dcaegen2-services-datalake-handler'
+ project: "dcaegen2/services"
+ project-name: "dcaegen2-services-datalake-handler"
jobs:
- gerrit-maven-stage:
sign-artifacts: true
sbom-generator: true
- sbom-path: 'components/datalake-handler/'
- build-node: centos7-builder-4c-4g
+ sbom-path: "components/datalake-handler/"
+ build-node: centos8-docker-4c-4g
maven-versions-plugin: true
- mvn-pom: 'components/datalake-handler/pom.xml'
- mvn-params: '-f components/datalake-handler/pom.xml'
- version-properties-file: 'components/datalake-handler/version.properties'
+ mvn-pom: "components/datalake-handler/pom.xml"
+ mvn-params: "-f components/datalake-handler/pom.xml"
+ version-properties-file: "components/datalake-handler/version.properties"
- gerrit-maven-docker-stage:
build-node: ubuntu1804-docker-8c-8g
- mvn-goals: 'clean package dockerfile:build dockerfile:push -f components/datalake-handler/feeder/pom.xml'
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
+ mvn-goals: "clean package dockerfile:build dockerfile:push -f components/datalake-handler/feeder/pom.xml"
+ container-public-registry: "nexus3.onap.org:10001"
+ container-staging-registry: "nexus3.onap.org:10003"
stream:
- - 'master':
- branch: 'master'
- - 'kohn':
- branch: 'kohn'
+ - "master":
+ branch: "master"
+ - "london":
+ branch: "london"
java-version: openjdk11
gerrit_trigger_file_paths:
- compare-type: ANT
- pattern: 'components/datalake-handler/feeder/**'
- mvn-settings: 'dcaegen2-services-settings'
+ pattern: "components/datalake-handler/feeder/**"
+ mvn-settings: "dcaegen2-services-settings"
maven-deploy-properties: |
deployAtEnd=true
- files: '**'
- archive-artifacts: ''
- build-node: 'ubuntu1804-docker-8c-8g'
+ files: "**"
+ archive-artifacts: ""
+ build-node: "ubuntu1804-docker-8c-8g"
- project:
name: dcaegen2-services-datalake-handler-admin-ui-release
- project: 'dcaegen2/services'
- project-name: 'dcaegen2-services-datalake-handler-admin-ui'
+ project: "dcaegen2/services"
+ project-name: "dcaegen2-services-datalake-handler-admin-ui"
jobs:
- gerrit-maven-stage:
sbom-generator: true
- sbom-path: 'components/datalake-handler/'
+ sbom-path: "components/datalake-handler/"
sign-artifacts: true
- build-node: centos7-builder-4c-4g
+ build-node: centos8-docker-4c-4g
maven-versions-plugin: true
- mvn-pom: 'components/datalake-handler/pom.xml'
- mvn-params: '-f components/datalake-handler/pom.xml'
- version-properties-file: 'components/datalake-handler/version.properties'
+ mvn-pom: "components/datalake-handler/pom.xml"
+ mvn-params: "-f components/datalake-handler/pom.xml"
+ version-properties-file: "components/datalake-handler/version.properties"
- gerrit-maven-docker-stage:
build-node: ubuntu1804-docker-8c-8g
- mvn-goals: 'clean package dockerfile:build dockerfile:push -f components/datalake-handler/admin/pom.xml'
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
+ mvn-goals: "clean package dockerfile:build dockerfile:push -f components/datalake-handler/admin/pom.xml"
+ container-public-registry: "nexus3.onap.org:10001"
+ container-staging-registry: "nexus3.onap.org:10003"
stream:
- - 'master':
- branch: 'master'
- - 'kohn':
- branch: 'kohn'
+ - "master":
+ branch: "master"
+ - "london":
+ branch: "london"
java-version: openjdk11
gerrit_trigger_file_paths:
- compare-type: ANT
- pattern: 'components/datalake-handler/admin/**'
- mvn-settings: 'dcaegen2-services-settings'
+ pattern: "components/datalake-handler/admin/**"
+ mvn-settings: "dcaegen2-services-settings"
maven-deploy-properties: |
deployAtEnd=true
- files: '**'
- archive-artifacts: ''
- build-node: 'ubuntu1804-docker-8c-8g'
+ files: "**"
+ archive-artifacts: ""
+ build-node: "ubuntu1804-docker-8c-8g"
- project:
name: dcaegen2-services-datalake-handler-des-release
- project: 'dcaegen2/services'
- project-name: 'dcaegen2-services-datalake-handler-des'
+ project: "dcaegen2/services"
+ project-name: "dcaegen2-services-datalake-handler-des"
jobs:
- gerrit-maven-stage:
sbom-generator: true
- sbom-path: 'components/datalake-handler/'
+ sbom-path: "components/datalake-handler/"
sign-artifacts: true
- build-node: centos7-builder-4c-4g
+ build-node: centos8-docker-4c-4g
maven-versions-plugin: true
- mvn-pom: 'components/datalake-handler/pom.xml'
- mvn-params: '-f components/datalake-handler/pom.xml'
- version-properties-file: 'components/datalake-handler/version.properties'
+ mvn-pom: "components/datalake-handler/pom.xml"
+ mvn-params: "-f components/datalake-handler/pom.xml"
+ version-properties-file: "components/datalake-handler/version.properties"
- gerrit-maven-docker-stage:
build-node: ubuntu1804-docker-8c-8g
- mvn-goals: 'clean package dockerfile:build dockerfile:push -f components/datalake-handler/des/pom.xml'
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
+ mvn-goals: "clean package dockerfile:build dockerfile:push -f components/datalake-handler/des/pom.xml"
+ container-public-registry: "nexus3.onap.org:10001"
+ container-staging-registry: "nexus3.onap.org:10003"
stream:
- - 'master':
- branch: 'master'
- - 'kohn':
- branch: 'kohn'
+ - "master":
+ branch: "master"
+ - "london":
+ branch: "london"
java-version: openjdk11
- mvn-settings: 'dcaegen2-services-settings'
+ mvn-settings: "dcaegen2-services-settings"
maven-deploy-properties: |
deployAtEnd=true
- files: '**'
+ files: "**"
gerrit_trigger_file_paths:
- compare-type: ANT
- pattern: 'components/datalake-handler/des/**'
- archive-artifacts: ''
- build-node: 'ubuntu1804-docker-8c-8g'
+ pattern: "components/datalake-handler/des/**"
+ archive-artifacts: ""
+ build-node: "ubuntu1804-docker-8c-8g"
- project:
name: dcaegen2-services-datalake-handler-sonar
@@ -140,16 +140,15 @@
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
build-node: ubuntu1804-docker-8c-8g
- project: 'dcaegen2/services'
- project-name: 'dcaegen2-services-datalake-handler'
- branch: 'master'
- mvn-settings: 'dcaegen2-services-settings'
- mvn-params: '-f components/datalake-handler/pom.xml'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ project: "dcaegen2/services"
+ project-name: "dcaegen2-services-datalake-handler"
+ branch: "master"
+ mvn-settings: "dcaegen2-services-settings"
+ mvn-params: "-f components/datalake-handler/pom.xml"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
diff --git a/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml b/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml
index 478c61e..53b6869 100644
--- a/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml
@@ -35,56 +35,43 @@
# jobs:
# - dcaegen2-docker-python-jobs
- name: '{project-name}-docker-python-jobs'
- id: dcaegen2-services-docker-python-jobs
+ name: "{project-name}-docker-python-jobs"
container-tag-method: latest
- docker-get-container-tag-script: '../../shell/docker-ts-tag-override.sh'
- nexus-iq-namespace: 'onap-'
- tox-dir: '{src-dir}'
- tox-envs: 'py3'
+ docker-get-container-tag-script: "../../shell/docker-ts-tag-override.sh"
+ nexus-iq-namespace: "onap-"
+ tox-dir: "{src-dir}"
+ tox-envs: "py3"
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
python-version: python3
- wss-product-name: '{project-name}'
- docker-root: '{src-dir}'
+ wss-product-name: "{project-name}"
+ docker-root: "{src-dir}"
gerrit_trigger_file_paths:
- compare-type: REG_EXP
- pattern: '{src-dir}/.*'
+ pattern: "{src-dir}/.*"
jobs:
- gerrit-tox-verify:
pre-build-script: !include-raw-escape: ../../shell/onap-gerrit-review-wrapper.sh
stream: all
- branch: '*'
+ branch: "*"
- gerrit-docker-verify
- gerrit-docker-merge:
post_docker_build_script: |
- #!/bin/bash
- set -uex -o pipefail
- DOCKER_IMAGE_TAG2=${{DOCKER_IMAGE_TAG%-*}}
- DNAME={container-snapshot-registry}/{docker-name}
- docker tag $DNAME:$DOCKER_IMAGE_TAG $DNAME:$DOCKER_IMAGE_TAG2
- docker tag $DNAME:$DOCKER_IMAGE_TAG $DNAME:latest
- docker push $DNAME:$DOCKER_IMAGE_TAG2
- docker push $DNAME:latest
+ #!/bin/bash
+ set -uex -o pipefail
+ DOCKER_IMAGE_TAG2=${{DOCKER_IMAGE_TAG%-*}}
+ DNAME={container-snapshot-registry}/{docker-name}
+ docker tag $DNAME:$DOCKER_IMAGE_TAG $DNAME:$DOCKER_IMAGE_TAG2
+ docker tag $DNAME:$DOCKER_IMAGE_TAG $DNAME:latest
+ docker push $DNAME:$DOCKER_IMAGE_TAG2
+ docker push $DNAME:latest
stream: master
branch: master
- - gerrit-docker-merge-maintainance:
- post_docker_build_script: |
- #!/bin/bash
- set -uex -o pipefail
- DOCKER_IMAGE_TAG2=${{DOCKER_IMAGE_TAG%-*}}
- DNAME={container-snapshot-registry}/{docker-name}
- docker tag $DNAME:$DOCKER_IMAGE_TAG $DNAME:$DOCKER_IMAGE_TAG2
- docker push $DNAME:$DOCKER_IMAGE_TAG2
- stream: kohn
- branch: kohn
- cron: ''
- gerrit-tox-sonar:
# workaround because gerrit-tox-sonar doesn't support mvn-params/opts
- sonar-mvn-goal: '-f {src-dir}/pom.xml sonar:sonar'
- cron: '@daily'
+ sonar-mvn-goal: "-f {src-dir}/pom.xml sonar:sonar"
+ cron: "@daily"
stream: master
branch: master
@@ -97,16 +84,33 @@
- dcaegen2-services-pmsh:
src-dir: components/pm-subscription-handler
docker-name: onap/org.onap.dcaegen2.services.pmsh
+ stream:
+ - master:
+ branch: master
+ - london:
+ branch: london
+ jobs:
+ - "{project-name}-docker-python-jobs"
+
+- project:
+ name: dcaegen2-services-ml
+ project: dcaegen2/services
+ mvn-settings: dcaegen2-services-settings
+ build-node: ubuntu1804-docker-8c-8g
+ project-name:
- dcaegen2-services-ml-prediction-ms:
src-dir: components/ml-prediction-ms
docker-name: onap/org.onap.dcaegen2.services.ml-prediction-ms
stream:
- master:
branch: master
- - kohn:
- branch: kohn
+ - london:
+ branch: london
+ jobs:
+ - "{project-name}-docker-python-jobs"
+
+- project:
+ name: dcaegen2-services-subprojects-view
views:
- project-view:
project-name: dcaegen2-services-pmsh
- jobs:
- - dcaegen2-services-docker-python-jobs
diff --git a/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml b/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml
index f4a5f11..e602106 100644
--- a/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml
@@ -1,28 +1,28 @@
---
- project:
name: dcaegen2-services-heartbeat
- project-name: 'dcaegen2-services-heartbeat'
+ project-name: "dcaegen2-services-heartbeat"
jobs:
- - '{project-name}-python-jobs':
- pre-build-script: !include-raw-escape: ../../shell/onap-gerrit-review-wrapper.sh
- - '{project-name}-{stream}-release-version-java-daily'
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
- project: 'dcaegen2/services/heartbeat'
+ - "{project-name}-python-jobs":
+ pre-build-script: !include-raw-escape: ../../shell/onap-gerrit-review-wrapper.sh
+ - "{project-name}-{stream}-release-version-java-daily"
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
+ project: "dcaegen2/services/heartbeat"
stream:
- - 'master':
- branch: 'master'
- - 'kohn':
- branch: 'kohn'
- mvn-settings: 'dcaegen2-services-heartbeat-settings'
+ - "master":
+ branch: "master"
+ - "london":
+ branch: "london"
+ mvn-settings: "dcaegen2-services-heartbeat-settings"
# due to a strange macro / variable translation problem this needs
# to be passed as a string block to properly get the properties
# correctly defined in the job
maven-deploy-properties: |
deployAtEnd=true
- files: '**'
- archive-artifacts: ''
- build-node: 'ubuntu1804-docker-8c-8g'
+ files: "**"
+ archive-artifacts: ""
+ build-node: "ubuntu1804-docker-8c-8g"
build-timeout: 60
- project:
@@ -30,35 +30,34 @@
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
build-node: ubuntu1804-docker-8c-8g
- project: 'dcaegen2/services/heartbeat'
- project-name: 'dcaegen2-services-heartbeat'
- branch: 'master'
- mvn-settings: 'dcaegen2-services-heartbeat-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ project: "dcaegen2/services/heartbeat"
+ project-name: "dcaegen2-services-heartbeat"
+ branch: "master"
+ mvn-settings: "dcaegen2-services-heartbeat-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
- project:
name: dcaegen2-services-heartbeat-clm
jobs:
- gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
+ nexus-iq-namespace: "onap-"
project: dcaegen2/services/heartbeat
build-node: ubuntu1804-docker-8c-8g
- project-name: 'dcaegen2-services-heartbeat'
- branch: 'master'
- mvn-settings: 'dcaegen2-services-heartbeat-settings'
+ project-name: "dcaegen2-services-heartbeat"
+ branch: "master"
+ mvn-settings: "dcaegen2-services-heartbeat-settings"
- project:
name: dcaegen2-services-heartbeat-info
project-name: dcaegen2-services-heartbeat
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: dcaegen2/services/heartbeat
branch: master
diff --git a/jjb/dcaegen2/dcaegen2-services-kpi-computation-ms.yaml b/jjb/dcaegen2/dcaegen2-services-kpi-computation-ms.yaml
index c8ec262..dbc88e8 100644
--- a/jjb/dcaegen2/dcaegen2-services-kpi-computation-ms.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-kpi-computation-ms.yaml
@@ -1,64 +1,64 @@
---
- project:
name: dcaegen2-services-kpi-computation-ms
- project-name: 'dcaegen2-services-kpi-computation-ms'
- project: 'dcaegen2/services'
+ project-name: "dcaegen2-services-kpi-computation-ms"
+ project: "dcaegen2/services"
jobs:
- gerrit-maven-verify:
pre-build-script: !include-raw-escape: ../../shell/onap-gerrit-review-wrapper.sh
- gerrit-maven-merge
stream:
- - 'master':
- branch: 'master'
- - 'kohn':
- branch: 'kohn'
+ - "master":
+ branch: "master"
+ - "london":
+ branch: "london"
java-version: openjdk11
- mvn-settings: 'dcaegen2-services-settings'
- files: '**'
- archive-artifacts: ''
- build-node: 'ubuntu1804-docker-8c-8g'
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
- mvn-goals: 'clean package docker:build'
- mvn-params: '-f components/kpi-computation-ms/pom.xml'
+ mvn-settings: "dcaegen2-services-settings"
+ files: "**"
+ archive-artifacts: ""
+ build-node: "ubuntu1804-docker-8c-8g"
+ container-public-registry: "nexus3.onap.org:10001"
+ container-staging-registry: "nexus3.onap.org:10003"
+ mvn-goals: "clean package docker:build"
+ mvn-params: "-f components/kpi-computation-ms/pom.xml"
gerrit_trigger_file_paths:
- compare-type: ANT
- pattern: 'components/kpi-computation-ms/**'
- mvn-snapshot-id: 'ecomp-snapshots'
- nexus-snapshot-repo: 'snapshots'
+ pattern: "components/kpi-computation-ms/**"
+ mvn-snapshot-id: "ecomp-snapshots"
+ nexus-snapshot-repo: "snapshots"
maven-deploy-properties: |
deployAtEnd=true
- project:
name: dcaegen2-services-kpi-computation-ms-release
- project-name: 'dcaegen2-services-kpi-computation-ms'
- project: 'dcaegen2/services'
+ project-name: "dcaegen2-services-kpi-computation-ms"
+ project: "dcaegen2/services"
jobs:
- gerrit-maven-stage:
sign-artifacts: true
sbom-generator: true
- sbom-path: 'components/kpi-computation-ms/'
- build-node: centos7-docker-8c-8g
+ sbom-path: "components/kpi-computation-ms/"
+ build-node: centos8-docker-8c-8g
maven-versions-plugin: true
- mvn-pom: 'components/kpi-computation-ms/pom.xml'
- mvn-params: '-f components/kpi-computation-ms/pom.xml'
+ mvn-pom: "components/kpi-computation-ms/pom.xml"
+ mvn-params: "-f components/kpi-computation-ms/pom.xml"
- gerrit-maven-docker-stage:
build-node: ubuntu1804-docker-8c-8g
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
- mvn-goals: 'clean package docker:build -DpushImageTag'
- mvn-params: '-f components/kpi-computation-ms/pom.xml'
+ container-public-registry: "nexus3.onap.org:10001"
+ container-staging-registry: "nexus3.onap.org:10003"
+ mvn-goals: "clean package docker:build -DpushImageTag"
+ mvn-params: "-f components/kpi-computation-ms/pom.xml"
stream:
- - 'master':
- branch: 'master'
+ - "master":
+ branch: "master"
java-version: openjdk11
- mvn-settings: 'dcaegen2-services-settings'
- files: '**'
- archive-artifacts: ''
+ mvn-settings: "dcaegen2-services-settings"
+ files: "**"
+ archive-artifacts: ""
gerrit_trigger_file_paths:
- compare-type: ANT
- pattern: 'components/kpi-computation-ms/**'
- build-node: 'ubuntu1804-docker-8c-8g'
+ pattern: "components/kpi-computation-ms/**"
+ build-node: "ubuntu1804-docker-8c-8g"
maven-deploy-properties: |
deployAtEnd=true
@@ -68,31 +68,30 @@
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
build-node: ubuntu1804-docker-8c-8g
- project: 'dcaegen2/services'
- project-name: 'dcaegen2-services-kpi-computation-ms'
- branch: 'master'
- mvn-settings: 'dcaegen2-services-settings'
- mvn-goals: 'clean install'
- mvn-params: '-f components/kpi-computation-ms/pom.xml'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ project: "dcaegen2/services"
+ project-name: "dcaegen2-services-kpi-computation-ms"
+ branch: "master"
+ mvn-settings: "dcaegen2-services-settings"
+ mvn-goals: "clean install"
+ mvn-params: "-f components/kpi-computation-ms/pom.xml"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
- project:
name: dcaegen2-services-kpi-computation-ms-clm
java-version: openjdk11
jobs:
- gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
+ nexus-iq-namespace: "onap-"
project: dcaegen2/services
build-node: ubuntu1804-docker-8c-8g
- project-name: 'dcaegen2-services-kpi-computation-ms-clm'
- mvn-params: '-f components/kpi-computation-ms/pom.xml'
+ project-name: "dcaegen2-services-kpi-computation-ms-clm"
+ mvn-params: "-f components/kpi-computation-ms/pom.xml"
stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'dcaegen2-services-settings'
+ - "master":
+ branch: "master"
+ mvn-settings: "dcaegen2-services-settings"
diff --git a/jjb/dcaegen2/dcaegen2-services-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-mapper.yaml
index eed6c2a..66b3dd2 100644
--- a/jjb/dcaegen2/dcaegen2-services-mapper.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-mapper.yaml
@@ -1,7 +1,7 @@
---
- project:
name: dcaegen2-services-mapper
- project-name: 'dcaegen2-services-mapper'
+ project-name: "dcaegen2-services-mapper"
java-version: openjdk11
jobs:
- gerrit-maven-verify:
@@ -10,28 +10,28 @@
- gerrit-maven-stage:
sign-artifacts: true
sbom-generator: true
- build-node: centos7-builder-4c-4g
+ build-node: centos8-docker-4c-4g
maven-versions-plugin: true
- gerrit-maven-docker-stage:
build-node: ubuntu1804-docker-8c-8g
- mvn-goals: 'clean package docker:build -DpushImageTag'
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
+ mvn-goals: "clean package docker:build -DpushImageTag"
+ container-public-registry: "nexus3.onap.org:10001"
+ container-staging-registry: "nexus3.onap.org:10003"
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
- project: 'dcaegen2/services/mapper'
+ project: "dcaegen2/services/mapper"
stream:
- - 'master':
- branch: 'master'
- - 'kohn':
- branch: 'kohn'
- mvn-settings: 'dcaegen2-services-mapper-settings'
- mvn-snapshot-id: 'ecomp-snapshots'
- nexus-snapshot-repo: 'snapshots'
- files: '**'
- archive-artifacts: ''
- build-node: 'ubuntu1804-docker-8c-8g'
+ - "master":
+ branch: "master"
+ - "london":
+ branch: "london"
+ mvn-settings: "dcaegen2-services-mapper-settings"
+ mvn-snapshot-id: "ecomp-snapshots"
+ nexus-snapshot-repo: "snapshots"
+ files: "**"
+ archive-artifacts: ""
+ build-node: "ubuntu1804-docker-8c-8g"
maven-deploy-properties: |
deployAtEnd=true
@@ -41,32 +41,31 @@
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
build-node: ubuntu1804-builder-4c-4g
- project: 'dcaegen2/services/mapper'
- project-name: 'dcaegen2-services-mapper'
- branch: 'master'
- mvn-settings: 'dcaegen2-services-mapper-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ project: "dcaegen2/services/mapper"
+ project-name: "dcaegen2-services-mapper"
+ branch: "master"
+ mvn-settings: "dcaegen2-services-mapper-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
- project:
name: dcaegen2-services-mapper-clm
java-version: openjdk11
jobs:
- gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
+ nexus-iq-namespace: "onap-"
project: dcaegen2/services/mapper
build-node: ubuntu1804-docker-8c-8g
- project-name: 'dcaegen2-services-mapper'
+ project-name: "dcaegen2-services-mapper"
stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'dcaegen2-services-mapper-settings'
+ - "master":
+ branch: "master"
+ mvn-settings: "dcaegen2-services-mapper-settings"
- project:
name: dcaegen2-services-mapper-info
@@ -74,6 +73,6 @@
java-version: openjdk11
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: dcaegen2/services/mapper
branch: master
diff --git a/jjb/dcaegen2/dcaegen2-services-pm-mapper-csit.yaml b/jjb/dcaegen2/dcaegen2-services-pm-mapper-csit.yaml
index f7bbf5a..a6d7d13 100644
--- a/jjb/dcaegen2/dcaegen2-services-pm-mapper-csit.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-pm-mapper-csit.yaml
@@ -1,18 +1,18 @@
---
- project:
- name: dcaegen2-services-pm-mapper-csit
- jobs:
- - '{project-name}-review-verification-maven-{stream}':
- mvn-goals: clean install docker:build
- - '{project-name}-merge-verification-maven-{stream}':
- mvn-goals: clean install docker:build
- project-name: 'dcaegen2-services-pm-mapper'
- recipients: 'vv770d@att.com lego@est.tech rajendra.jaiswal@ericsson.com'
- # project name in gerrit
- project: 'dcaegen2/services/pm-mapper'
- stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'dcaegen2-services-pm-mapper-settings'
- robot-options: ''
- branch: 'master'
+ name: dcaegen2-services-pm-mapper-csit
+ jobs:
+ - "{project-name}-review-verification-maven-{stream}":
+ mvn-goals: clean install docker:build
+ - "{project-name}-merge-verification-maven-{stream}":
+ mvn-goals: clean install docker:build
+ project-name: "dcaegen2-services-pm-mapper"
+ recipients: "vv770d@att.com lego@est.tech rajendra.jaiswal@ericsson.com"
+ # project name in gerrit
+ project: "dcaegen2/services/pm-mapper"
+ stream:
+ - "master":
+ branch: "master"
+ mvn-settings: "dcaegen2-services-pm-mapper-settings"
+ robot-options: ""
+ branch: "master"
diff --git a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
index f78c82b..5a19b82 100644
--- a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
@@ -2,80 +2,79 @@
- project:
name: dcaegen2-services-pm-mapper
# job template iterators
- project-name: 'dcaegen2-services-pm-mapper'
+ project-name: "dcaegen2-services-pm-mapper"
stream:
- - 'master':
- branch: 'master'
- - 'kohn':
- branch: 'kohn'
+ - "master":
+ branch: "master"
+ - "london":
+ branch: "london"
java-version: openjdk11
# apply to all jobs
- project: 'dcaegen2/services/pm-mapper'
- mvn-settings: 'dcaegen2-services-pm-mapper-settings'
- mvn-snapshot-id: 'ecomp-snapshots'
- nexus-snapshot-repo: 'snapshots'
+ project: "dcaegen2/services/pm-mapper"
+ mvn-settings: "dcaegen2-services-pm-mapper-settings"
+ mvn-snapshot-id: "ecomp-snapshots"
+ nexus-snapshot-repo: "snapshots"
maven-deploy-properties: |
deployAtEnd=true
- files: '**'
- archive-artifacts: ''
+ files: "**"
+ archive-artifacts: ""
build-node: ubuntu1804-docker-8c-8g
jobs:
- gerrit-maven-verify:
pre-build-script: !include-raw-escape: ../../shell/onap-gerrit-review-wrapper.sh
- mvn-goals: 'clean install docker:build'
+ mvn-goals: "clean install docker:build"
- gerrit-maven-merge:
- mvn-goals: 'clean deploy'
+ mvn-goals: "clean deploy"
- gerrit-maven-stage:
sign-artifacts: true
sbom-generator: true
- build-node: centos7-docker-8c-8g
+ build-node: centos8-docker-8c-8g
maven-versions-plugin: true
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
- gerrit-maven-docker-stage:
build-node: ubuntu1804-docker-8c-8g
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
- mvn-goals: 'clean install docker:build docker:push'
+ container-public-registry: "nexus3.onap.org:10001"
+ container-staging-registry: "nexus3.onap.org:10003"
+ mvn-goals: "clean install docker:build docker:push"
- project:
name: dcaegen2-services-pm-mapper-sonar
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
build-node: ubuntu1804-docker-8c-8g
- project: 'dcaegen2/services/pm-mapper'
- project-name: 'dcaegen2-services-pm-mapper'
- branch: 'master'
+ project: "dcaegen2/services/pm-mapper"
+ project-name: "dcaegen2-services-pm-mapper"
+ branch: "master"
java-version: openjdk11
- mvn-settings: 'dcaegen2-services-pm-mapper-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ mvn-settings: "dcaegen2-services-pm-mapper-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
- project:
name: dcaegen2-services-pm-mapper-clm
jobs:
- gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
+ nexus-iq-namespace: "onap-"
project: dcaegen2/services/pm-mapper
build-node: ubuntu1804-docker-8c-8g
- project-name: 'dcaegen2-services-pm-mapper'
+ project-name: "dcaegen2-services-pm-mapper"
stream:
- - 'master':
- branch: 'master'
+ - "master":
+ branch: "master"
java-version: openjdk11
- mvn-settings: 'dcaegen2-services-pm-mapper-settings'
+ mvn-settings: "dcaegen2-services-pm-mapper-settings"
- project:
name: dcaegen2-services-pm-mapper-info
project-name: dcaegen2-services-pm-mapper
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: dcaegen2/services/pm-mapper
branch: master
diff --git a/jjb/dcaegen2/dcaegen2-services-pm-subscription-handler-csit.yaml b/jjb/dcaegen2/dcaegen2-services-pm-subscription-handler-csit.yaml
index a6bc305..974499e 100644
--- a/jjb/dcaegen2/dcaegen2-services-pm-subscription-handler-csit.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-pm-subscription-handler-csit.yaml
@@ -1,15 +1,16 @@
+---
- project:
name: dcaegen2-services-pmsh-csit
jobs:
- - '{project-name}-{stream}-verify-csit-{functionality}'
- - '{project-name}-{stream}-csit-{functionality}'
+ - "{project-name}-{stream}-verify-csit-{functionality}"
+ - "{project-name}-{stream}-csit-{functionality}"
project-name: dcaegen2-services-pmsh
- recipients: 'lego@est.tech'
+ recipients: "lego@est.tech"
stream:
- - 'master':
- branch: 'master'
+ - "master":
+ branch: "master"
functionality:
- - 'testsuite':
+ - "testsuite":
trigger_jobs:
- - '{project-name}-docker-merge-master'
- robot-options: ''
+ - "{project-name}-docker-merge-master"
+ robot-options: ""
diff --git a/jjb/dcaegen2/dcaegen2-services-prh.yaml b/jjb/dcaegen2/dcaegen2-services-prh.yaml
index 9c22491..690ce82 100644
--- a/jjb/dcaegen2/dcaegen2-services-prh.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-prh.yaml
@@ -1,36 +1,36 @@
---
- project:
name: dcaegen2-services-prh
- project-name: 'dcaegen2-services-prh'
+ project-name: "dcaegen2-services-prh"
jobs:
- gerrit-maven-verify:
pre-build-script: !include-raw-escape: ../../shell/onap-gerrit-review-wrapper.sh
- gerrit-maven-merge
- gerrit-maven-stage:
sign-artifacts: true
- build-node: centos7-docker-8c-8g
+ build-node: centos8-docker-8c-8g
maven-versions-plugin: true
sbom-generator: true
- gerrit-maven-docker-stage:
build-node: ubuntu1804-docker-8c-8g
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
- mvn-goals: 'clean package docker:build docker:push'
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
- project: 'dcaegen2/services/prh'
+ container-public-registry: "nexus3.onap.org:10001"
+ container-staging-registry: "nexus3.onap.org:10003"
+ mvn-goals: "clean package docker:build docker:push"
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
+ project: "dcaegen2/services/prh"
stream:
- - 'master':
- branch: 'master'
- - 'kohn':
- branch: 'kohn'
+ - "master":
+ branch: "master"
+ - "london":
+ branch: "london"
java-version: openjdk11
- mvn-settings: 'dcaegen2-services-prh-settings'
- mvn-snapshot-id: 'ecomp-snapshots'
- nexus-snapshot-repo: 'snapshots'
- files: '**'
- archive-artifacts: ''
- build-node: 'ubuntu1804-docker-8c-8g'
+ mvn-settings: "dcaegen2-services-prh-settings"
+ mvn-snapshot-id: "ecomp-snapshots"
+ nexus-snapshot-repo: "snapshots"
+ files: "**"
+ archive-artifacts: ""
+ build-node: "ubuntu1804-docker-8c-8g"
maven-deploy-properties: |
deployAtEnd=true
@@ -39,39 +39,38 @@
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
build-node: ubuntu1804-docker-8c-8g
java-version: openjdk11
- project: 'dcaegen2/services/prh'
- project-name: 'dcaegen2-services-prh'
- branch: 'master'
- mvn-settings: 'dcaegen2-services-prh-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ project: "dcaegen2/services/prh"
+ project-name: "dcaegen2-services-prh"
+ branch: "master"
+ mvn-settings: "dcaegen2-services-prh-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
- project:
name: dcaegen2-services-prh-clm
jobs:
- gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
+ nexus-iq-namespace: "onap-"
project: dcaegen2/services/prh
build-node: ubuntu1804-docker-8c-8g
java-version: openjdk11
- project-name: 'dcaegen2-services-prh'
+ project-name: "dcaegen2-services-prh"
stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'dcaegen2-services-prh-settings'
+ - "master":
+ branch: "master"
+ mvn-settings: "dcaegen2-services-prh-settings"
- project:
name: dcaegen2-services-prh-info
project-name: dcaegen2-services-prh
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: dcaegen2/services/prh
branch: master
diff --git a/jjb/dcaegen2/dcaegen2-services-sdk.yaml b/jjb/dcaegen2/dcaegen2-services-sdk.yaml
index f31a6b9..f09b747 100644
--- a/jjb/dcaegen2/dcaegen2-services-sdk.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-sdk.yaml
@@ -1,7 +1,7 @@
---
- project:
name: dcaegen2-services-sdk
- project-name: 'dcaegen2-services-sdk'
+ project-name: "dcaegen2-services-sdk"
jobs:
- gerrit-maven-verify:
pre-build-script: !include-raw-escape: ../../shell/onap-gerrit-review-wrapper.sh
@@ -9,24 +9,24 @@
- gerrit-maven-stage:
sign-artifacts: true
sbom-generator: false
- build-node: centos7-docker-8c-8g
+ build-node: centos8-docker-8c-8g
maven-versions-plugin: true
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
- project: 'dcaegen2/services/sdk'
+ project: "dcaegen2/services/sdk"
stream:
- - 'master':
- branch: 'master'
- - 'kohn':
- branch: 'kohn'
+ - "master":
+ branch: "master"
+ - "london":
+ branch: "london"
java-version: openjdk11
- mvn-settings: 'dcaegen2-services-sdk-settings'
- mvn-snapshot-id: 'ecomp-snapshots'
- nexus-snapshot-repo: 'snapshots'
- files: '**'
- archive-artifacts: ''
- build-node: 'centos7-docker-8c-8g'
+ mvn-settings: "dcaegen2-services-sdk-settings"
+ mvn-snapshot-id: "ecomp-snapshots"
+ nexus-snapshot-repo: "snapshots"
+ files: "**"
+ archive-artifacts: ""
+ build-node: "centos8-docker-8c-8g"
maven-deploy-properties: |
deployAtEnd=true
@@ -34,16 +34,16 @@
name: dcaegen2-services-sdk-integration-pairwise
java-version: openjdk11
jobs:
- - '{project-name}-{stream}-integration-pairwise':
+ - "{project-name}-{stream}-integration-pairwise":
build-env-variables: "TESTCONTAINERS_RYUK_DISABLED=true"
build-node: ubuntu1804-docker-8c-8g
- project: 'dcaegen2/services/sdk'
- project-name: 'dcaegen2-services-sdk'
+ project: "dcaegen2/services/sdk"
+ project-name: "dcaegen2-services-sdk"
stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'dcaegen2-services-sdk-settings'
- mvn-params: ' -P integration-pairwise'
+ - "master":
+ branch: "master"
+ mvn-settings: "dcaegen2-services-sdk-settings"
+ mvn-params: " -P integration-pairwise"
- project:
name: dcaegen2-services-sdk-sonar
@@ -51,38 +51,37 @@
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
- build-node: centos7-docker-8c-8g
- project: 'dcaegen2/services/sdk'
- project-name: 'dcaegen2-services-sdk'
- branch: 'master'
- mvn-settings: 'dcaegen2-services-sdk-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
+ build-node: centos8-docker-8c-8g
+ project: "dcaegen2/services/sdk"
+ project-name: "dcaegen2-services-sdk"
+ branch: "master"
+ mvn-settings: "dcaegen2-services-sdk-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
- project:
name: dcaegen2-services-sdk-clm
java-version: openjdk11
jobs:
- gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
+ nexus-iq-namespace: "onap-"
project: dcaegen2/services/sdk
- build-node: centos7-docker-8c-8g
- project-name: 'dcaegen2-services-sdk'
+ build-node: centos8-docker-8c-8g
+ project-name: "dcaegen2-services-sdk"
stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'dcaegen2-services-sdk-settings'
+ - "master":
+ branch: "master"
+ mvn-settings: "dcaegen2-services-sdk-settings"
- project:
name: dcaegen2-services-sdk-info
project-name: dcaegen2-services-sdk
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: dcaegen2/services/sdk
branch: master
diff --git a/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms-csit.yaml b/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms-csit.yaml
index 8c57bea..4b22989 100644
--- a/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms-csit.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms-csit.yaml
@@ -1,15 +1,16 @@
+---
- project:
name: dcaegen2-services-slice-analysis-ms-csit
jobs:
- - '{project-name}-{stream}-verify-csit-{functionality}'
- - '{project-name}-{stream}-csit-{functionality}'
- project-name: 'dcaegen2-services-slice-analysis-ms'
- recipients: 'vv770d@att.com ahila.pandaram@wipro.com niranjana.y60@wipro.com'
+ - "{project-name}-{stream}-verify-csit-{functionality}"
+ - "{project-name}-{stream}-csit-{functionality}"
+ project-name: "dcaegen2-services-slice-analysis-ms"
+ recipients: "vv770d@att.com ahila.pandaram@wipro.com niranjana.y60@wipro.com"
stream:
- - 'master':
- branch: 'master'
+ - "master":
+ branch: "master"
functionality:
- - 'testsuites':
+ - "testsuites":
trigger_jobs:
- - '{project-name}-{stream}-merge-java'
- robot-options: ''
+ - "{project-name}-{stream}-merge-java"
+ robot-options: ""
diff --git a/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml b/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml
index ae922dc..8b8e862 100644
--- a/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml
@@ -1,65 +1,65 @@
---
- project:
name: dcaegen2-services-slice-analysis-ms-verify
- project-name: 'dcaegen2-services-slice-analysis-ms'
- project: 'dcaegen2/services'
+ project-name: "dcaegen2-services-slice-analysis-ms"
+ project: "dcaegen2/services"
jobs:
- gerrit-maven-verify:
pre-build-script: !include-raw-escape: ../../shell/onap-gerrit-review-wrapper.sh
- gerrit-maven-merge
stream:
- - 'master':
- branch: 'master'
- - 'kohn':
- branch: 'kohn'
+ - "master":
+ branch: "master"
+ - "london":
+ branch: "london"
java-version: openjdk11
- mvn-settings: 'dcaegen2-services-settings'
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
- mvn-params: '-f components/slice-analysis-ms/pom.xml'
+ mvn-settings: "dcaegen2-services-settings"
+ container-public-registry: "nexus3.onap.org:10001"
+ container-staging-registry: "nexus3.onap.org:10003"
+ mvn-params: "-f components/slice-analysis-ms/pom.xml"
gerrit_trigger_file_paths:
- compare-type: ANT
- pattern: 'components/slice-analysis-ms/**'
- mvn-snapshot-id: 'ecomp-snapshots'
- mvn-version: 'mvn36'
- nexus-snapshot-repo: 'snapshots'
- files: '**'
- archive-artifacts: ''
- build-node: 'ubuntu1804-docker-8c-8g'
+ pattern: "components/slice-analysis-ms/**"
+ mvn-snapshot-id: "ecomp-snapshots"
+ mvn-version: "mvn36"
+ nexus-snapshot-repo: "snapshots"
+ files: "**"
+ archive-artifacts: ""
+ build-node: "ubuntu1804-docker-8c-8g"
maven-deploy-properties: |
deployAtEnd=true
- project:
name: dcaegen2-services-slice-analysis-ms-release
- project-name: 'dcaegen2-services-slice-analysis-ms'
- project: 'dcaegen2/services'
+ project-name: "dcaegen2-services-slice-analysis-ms"
+ project: "dcaegen2/services"
jobs:
- gerrit-maven-stage:
sign-artifacts: true
sbom-generator: true
- sbom-path: 'components/slice-analysis-ms/'
- build-node: centos7-docker-8c-8g
+ sbom-path: "components/slice-analysis-ms/"
+ build-node: centos8-docker-8c-8g
maven-versions-plugin: true
- mvn-pom: 'components/slice-analysis-ms/pom.xml'
- mvn-params: '-f components/slice-analysis-ms/pom.xml'
+ mvn-pom: "components/slice-analysis-ms/pom.xml"
+ mvn-params: "-f components/slice-analysis-ms/pom.xml"
- gerrit-maven-docker-stage:
build-node: ubuntu1804-docker-8c-8g
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
- mvn-goals: 'clean package docker:build -DpushImageTag'
- mvn-params: '-f components/slice-analysis-ms/pom.xml'
+ container-public-registry: "nexus3.onap.org:10001"
+ container-staging-registry: "nexus3.onap.org:10003"
+ mvn-goals: "clean package docker:build -DpushImageTag"
+ mvn-params: "-f components/slice-analysis-ms/pom.xml"
stream:
- - 'master':
- branch: 'master'
+ - "master":
+ branch: "master"
java-version: openjdk11
- mvn-settings: 'dcaegen2-services-settings'
- mvn-version: 'mvn36'
- files: '**'
- archive-artifacts: ''
+ mvn-settings: "dcaegen2-services-settings"
+ mvn-version: "mvn36"
+ files: "**"
+ archive-artifacts: ""
gerrit_trigger_file_paths:
- compare-type: ANT
- pattern: 'components/slice-analysis-ms/**'
- build-node: 'ubuntu1804-docker-8c-8g'
+ pattern: "components/slice-analysis-ms/**"
+ build-node: "ubuntu1804-docker-8c-8g"
maven-deploy-properties: |
deployAtEnd=true
@@ -69,31 +69,30 @@
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
build-node: ubuntu1804-docker-8c-8g
- project: 'dcaegen2/services'
- project-name: 'dcaegen2-services-slice-analysis-ms'
- branch: 'master'
- mvn-settings: 'dcaegen2-services-settings'
- mvn-goals: 'clean install'
- mvn-params: '-f components/slice-analysis-ms/pom.xml'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ project: "dcaegen2/services"
+ project-name: "dcaegen2-services-slice-analysis-ms"
+ branch: "master"
+ mvn-settings: "dcaegen2-services-settings"
+ mvn-goals: "clean install"
+ mvn-params: "-f components/slice-analysis-ms/pom.xml"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
- project:
name: dcaegen2-services-slice-analysis-ms-clm
java-version: openjdk11
jobs:
- gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
+ nexus-iq-namespace: "onap-"
project: dcaegen2/services
build-node: ubuntu1804-docker-8c-8g
- project-name: 'dcaegen2-services-slice-analysis-ms-clm'
- mvn-params: '-f components/slice-analysis-ms/pom.xml'
+ project-name: "dcaegen2-services-slice-analysis-ms-clm"
+ mvn-params: "-f components/slice-analysis-ms/pom.xml"
stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'dcaegen2-services-settings'
+ - "master":
+ branch: "master"
+ mvn-settings: "dcaegen2-services-settings"
diff --git a/jjb/dcaegen2/dcaegen2-services-son-handler-csit.yaml b/jjb/dcaegen2/dcaegen2-services-son-handler-csit.yaml
index 34b4a63..17683cf 100644
--- a/jjb/dcaegen2/dcaegen2-services-son-handler-csit.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-son-handler-csit.yaml
@@ -1,15 +1,16 @@
+---
- project:
name: dcaegen2-services-son-handler-csit
jobs:
- - '{project-name}-{stream}-verify-csit-{functionality}'
- - '{project-name}-{stream}-csit-{functionality}'
- project-name: 'dcaegen2-services-son-handler'
- recipients: 'vv770d@att.com reshmasree.chamarthi2@wipro.com niranjana.y60@wipro.com'
+ - "{project-name}-{stream}-verify-csit-{functionality}"
+ - "{project-name}-{stream}-csit-{functionality}"
+ project-name: "dcaegen2-services-son-handler"
+ recipients: "vv770d@att.com reshmasree.chamarthi2@wipro.com niranjana.y60@wipro.com"
stream:
- - 'master':
- branch: 'master'
+ - "master":
+ branch: "master"
functionality:
- - 'testsuites':
+ - "testsuites":
trigger_jobs:
- - '{project-name}-{stream}-merge-java'
- robot-options: ''
+ - "{project-name}-{stream}-merge-java"
+ robot-options: ""
diff --git a/jjb/dcaegen2/dcaegen2-services-son-handler.yaml b/jjb/dcaegen2/dcaegen2-services-son-handler.yaml
index 14ebeb3..b92c173 100644
--- a/jjb/dcaegen2/dcaegen2-services-son-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-son-handler.yaml
@@ -1,7 +1,7 @@
---
- project:
name: dcaegen2-services-son-handler
- project-name: 'dcaegen2-services-son-handler'
+ project-name: "dcaegen2-services-son-handler"
jobs:
- gerrit-maven-verify:
pre-build-script: !include-raw-escape: ../../shell/onap-gerrit-review-wrapper.sh
@@ -9,28 +9,28 @@
- gerrit-maven-stage:
sign-artifacts: true
sbom-generator: true
- build-node: centos7-docker-8c-8g
+ build-node: centos8-docker-8c-8g
maven-versions-plugin: true
- gerrit-maven-docker-stage:
build-node: ubuntu1804-docker-8c-8g
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
- mvn-goals: 'clean package docker:build -DpushImageTag'
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
- project: 'dcaegen2/services/son-handler'
+ container-public-registry: "nexus3.onap.org:10001"
+ container-staging-registry: "nexus3.onap.org:10003"
+ mvn-goals: "clean package docker:build -DpushImageTag"
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
+ project: "dcaegen2/services/son-handler"
stream:
- - 'master':
- branch: 'master'
- - 'kohn':
- branch: 'kohn'
+ - "master":
+ branch: "master"
+ - "london":
+ branch: "london"
java-version: openjdk11
- mvn-settings: 'dcaegen2-services-son-handler-settings'
- mvn-snapshot-id: 'ecomp-snapshots'
- nexus-snapshot-repo: 'snapshots'
- files: '**'
- archive-artifacts: ''
- build-node: 'ubuntu1804-docker-8c-8g'
+ mvn-settings: "dcaegen2-services-son-handler-settings"
+ mvn-snapshot-id: "ecomp-snapshots"
+ nexus-snapshot-repo: "snapshots"
+ files: "**"
+ archive-artifacts: ""
+ build-node: "ubuntu1804-docker-8c-8g"
maven-deploy-properties: |
deployAtEnd=true
@@ -40,32 +40,31 @@
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
build-node: ubuntu1804-docker-8c-8g
- project: 'dcaegen2/services/son-handler'
- project-name: 'dcaegen2-services-son-handler'
- branch: 'master'
- mvn-settings: 'dcaegen2-services-son-handler-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ project: "dcaegen2/services/son-handler"
+ project-name: "dcaegen2-services-son-handler"
+ branch: "master"
+ mvn-settings: "dcaegen2-services-son-handler-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
- project:
name: dcaegen2-services-son-handler-clm
java-version: openjdk11
jobs:
- gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
+ nexus-iq-namespace: "onap-"
project: dcaegen2/services/son-handler
build-node: ubuntu1804-docker-8c-8g
- project-name: 'dcaegen2-services-son-handler'
+ project-name: "dcaegen2-services-son-handler"
stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'dcaegen2-services-son-handler-settings'
+ - "master":
+ branch: "master"
+ mvn-settings: "dcaegen2-services-son-handler-settings"
- project:
name: dcaegen2-services-son-handler-info
@@ -73,6 +72,6 @@
project-name: dcaegen2-services-son-handler
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: dcaegen2/services/son-handler
branch: master
diff --git a/jjb/dcaegen2/dcaegen2-services.yaml b/jjb/dcaegen2/dcaegen2-services.yaml
index 4ff813e..4e0d0f2 100644
--- a/jjb/dcaegen2/dcaegen2-services.yaml
+++ b/jjb/dcaegen2/dcaegen2-services.yaml
@@ -4,7 +4,7 @@
project-name: dcaegen2-services
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: dcaegen2/services
branch: master
- project:
@@ -12,7 +12,7 @@
project-name: dcaegen2-services
mvn-settings: dcaegen2-services-settings
jobs:
- - '{project-name}-gerrit-release-jobs'
- build-node: centos7-docker-8c-8g
+ - "{project-name}-gerrit-release-jobs"
+ build-node: centos7-docker-2c-1g
project: dcaegen2/services
branch: master
diff --git a/jjb/dcaegen2/dcaegen2-utils.yaml b/jjb/dcaegen2/dcaegen2-utils.yaml
index f8275af..4b583e8 100644
--- a/jjb/dcaegen2/dcaegen2-utils.yaml
+++ b/jjb/dcaegen2/dcaegen2-utils.yaml
@@ -1,72 +1,71 @@
---
- project:
name: dcaegen2-utils
- project-name: 'dcaegen2-utils'
+ project-name: "dcaegen2-utils"
python-version: python3
jobs:
- gerrit-maven-verify:
pre-build-script: !include-raw-escape: ../../shell/onap-gerrit-review-wrapper.sh
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
- - '{project-name}-{stream}-release-version-java-daily'
- project: 'dcaegen2/utils'
+ - "{project-name}-{stream}-verify-java"
+ - "{project-name}-{stream}-merge-java"
+ - "{project-name}-{stream}-release-version-java-daily"
+ project: "dcaegen2/utils"
stream:
- - 'master':
- branch: 'master'
- - 'kohn':
- branch: 'kohn'
- mvn-settings: 'dcaegen2-utils-settings'
- mvn-snapshot-id: 'ecomp-snapshots'
- nexus-snapshot-repo: 'snapshots'
+ - "master":
+ branch: "master"
+ - "london":
+ branch: "london"
+ mvn-settings: "dcaegen2-utils-settings"
+ mvn-snapshot-id: "ecomp-snapshots"
+ nexus-snapshot-repo: "snapshots"
# due to a strange macro / variable translation problem this needs
# to be passed as a string block to properly get the properties
# correctly defined in the job
maven-deploy-properties: |
deployAtEnd=true
- files: '**'
- archive-artifacts: ''
- build-node: 'ubuntu1804-docker-8c-8g'
+ files: "**"
+ archive-artifacts: ""
+ build-node: "ubuntu1804-docker-8c-8g"
- project:
name: dcaegen2-utils-sonar
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
build-node: ubuntu1804-docker-8c-8g
- project: 'dcaegen2/utils'
- project-name: 'dcaegen2-utils'
- branch: 'master'
- mvn-settings: 'dcaegen2-utils-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ project: "dcaegen2/utils"
+ project-name: "dcaegen2-utils"
+ branch: "master"
+ mvn-settings: "dcaegen2-utils-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
- project:
name: dcaegen2-utils-clm
jobs:
- gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
+ nexus-iq-namespace: "onap-"
project: dcaegen2/utils
build-node: ubuntu1804-docker-8c-8g
- project-name: 'dcaegen2-utils'
- branch: 'master'
- mvn-settings: 'dcaegen2-utils-settings'
+ project-name: "dcaegen2-utils"
+ branch: "master"
+ mvn-settings: "dcaegen2-utils-settings"
- project:
name: dcaegen2-utils-info
project-name: dcaegen2-utils
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: dcaegen2/utils
branch: master
-- cbs_client_pypi_common: &cbs_client_pypi_common
+- _cbs_client_pypi_common: &cbs_client_pypi_common
name: cbs-client-pypi-common
# jenkins job prefix
project-name: dcaegen2-platform-cbs-client
@@ -75,7 +74,7 @@
# push credentials
mvn-settings: dcaegen2-utils-settings
# requires centos to sign release
- build-node: centos7-builder-2c-1g
+ build-node: centos8-docker-4c-4g
tox-dir: onap-dcae-cbs-docker-client
stream:
- master:
@@ -86,7 +85,7 @@
<<: *cbs_client_pypi_common
gerrit_trigger_file_paths:
- compare-type: REG_EXP
- pattern: 'onap-dcae-cbs-docker-client/{name}/.*'
+ pattern: "onap-dcae-cbs-docker-client/{name}/.*"
jobs:
- gerrit-pypi-verify
- gerrit-pypi-merge:
diff --git a/jjb/dcaegen2/dcaegen2-ves-prh-csit.yaml b/jjb/dcaegen2/dcaegen2-ves-prh-csit.yaml
index 11f333a..91d09a5 100644
--- a/jjb/dcaegen2/dcaegen2-ves-prh-csit.yaml
+++ b/jjb/dcaegen2/dcaegen2-ves-prh-csit.yaml
@@ -1,30 +1,31 @@
+---
- project:
name: dcaegen2-collectors-ves-testsuites-csit
jobs:
- - '{project-name}-{stream}-verify-csit-{functionality}'
- - '{project-name}-{stream}-csit-{functionality}'
- project-name: 'dcaegen2'
- recipients: 'vv770d@att.com pawel.kasperkiewicz@nokia.com'
+ - "{project-name}-{stream}-verify-csit-{functionality}"
+ - "{project-name}-{stream}-csit-{functionality}"
+ project-name: "dcaegen2"
+ recipients: "vv770d@att.com pawel.kasperkiewicz@nokia.com"
stream:
- - 'master':
- branch: 'master'
+ - "master":
+ branch: "master"
functionality:
- - 'testsuites'
+ - "testsuites"
trigger_jobs:
- - 'dcaegen2-collectors-ves-master-merge-java'
- robot-options: ''
+ - "dcaegen2-collectors-ves-master-merge-java"
+ robot-options: ""
- project:
name: dcaegen2-prh-testsuites-csit
jobs:
- - '{project-name}-{stream}-verify-csit-{functionality}'
- - '{project-name}-{stream}-csit-{functionality}'
- project-name: 'dcaegen2'
- recipients: 'vv770d@att.com piotr.wielebski@nokia.com kornel.janiak@nokia.com'
+ - "{project-name}-{stream}-verify-csit-{functionality}"
+ - "{project-name}-{stream}-csit-{functionality}"
+ project-name: "dcaegen2"
+ recipients: "vv770d@att.com piotr.wielebski@nokia.com kornel.janiak@nokia.com"
stream:
- - 'master':
- branch: 'master'
+ - "master":
+ branch: "master"
functionality:
- - 'prh-testsuites'
+ - "prh-testsuites"
trigger_jobs:
- - 'dcaegen2-services-prh-master-merge-java'
- robot-options: ''
+ - "dcaegen2-services-prh-master-merge-java"
+ robot-options: ""
diff --git a/jjb/dcaegen2/dcaegen2.yaml b/jjb/dcaegen2/dcaegen2.yaml
index e2d70f2..dfd1f02 100644
--- a/jjb/dcaegen2/dcaegen2.yaml
+++ b/jjb/dcaegen2/dcaegen2.yaml
@@ -7,44 +7,46 @@
- project:
name: dcaegen2
- project-name: 'dcaegen2'
+ project-name: "dcaegen2"
jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
- - '{project-name}-{stream}-release-version-java-daily'
+ - gerrit-maven-verify:
+ pre-build-script: !include-raw-escape: ../../shell/onap-gerrit-review-wrapper.sh
+ - gerrit-maven-merge
- project: 'dcaegen2'
+ project: "dcaegen2"
stream:
- - 'master':
- branch: 'master'
- - 'kohn':
- branch: 'kohn'
- - 'jakarta':
- branch: 'jakarta'
- mvn-settings: 'dcaegen2-settings'
+ - "master":
+ branch: "master"
+ - "london":
+ branch: "london"
+ - "kohn":
+ branch: "kohn"
+ mvn-snapshot-id: "ecomp-snapshots"
+ nexus-snapshot-repo: "snapshots"
+ mvn-settings: "dcaegen2-settings"
# due to a strange macro / variable translation problem this needs
# to be passed as a string block to properly get the properties
# correctly defined in the job
maven-deploy-properties: |
deployAtEnd=true
- files: '**'
- archive-artifacts: ''
+ files: "**"
+ archive-artifacts: ""
- project:
name: dcaegen2-clm
jobs:
- gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
- project: 'dcaegen2'
- project-name: 'dcaegen2'
- branch: 'master'
- mvn-settings: 'dcaegen2-settings'
+ nexus-iq-namespace: "onap-"
+ project: "dcaegen2"
+ project-name: "dcaegen2"
+ branch: "master"
+ mvn-settings: "dcaegen2-settings"
- project:
name: dcaegen2-info
project-name: dcaegen2
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: dcaegen2
branch: master
diff --git a/jjb/demo/demo.yaml b/jjb/demo/demo.yaml
index 5af7739..04e0a16 100644
--- a/jjb/demo/demo.yaml
+++ b/jjb/demo/demo.yaml
@@ -7,84 +7,75 @@
- project:
name: demo
- project-name: 'demo'
+ project-name: "demo"
jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
+ - "{project-name}-{stream}-verify-java"
+ - "{project-name}-{stream}-merge-java"
- gerrit-maven-stage:
sign-artifacts: true
- build-node: centos7-builder-4c-4g
+ build-node: centos8-docker-4c-4g
maven-versions-plugin: true
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
- project: 'demo'
+ project: "demo"
stream:
- - 'master':
- branch: 'master'
- - 'istanbul':
- branch: 'istanbul'
- - 'honolulu':
- branch: 'honolulu'
- mvn-settings: 'demo-settings'
- files: '**'
- archive-artifacts: ''
+ - "master":
+ branch: "master"
+ mvn-settings: "demo-settings"
+ files: "**"
+ archive-artifacts: ""
- project:
name: demo-sonar
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
build-node: ubuntu1804-builder-4c-4g
- project: 'demo'
- project-name: 'demo'
- branch: 'master'
- mvn-settings: 'demo-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ project: "demo"
+ project-name: "demo"
+ branch: "master"
+ mvn-settings: "demo-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
- project:
name: demo-info
project-name: demo
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: demo
branch: master
- project:
name: demo-linters
- project: 'demo'
- project-name: 'demo'
+ project: "demo"
+ project-name: "demo"
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'
+ - "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"
stream:
- - 'master':
- branch: 'master'
- - 'istanbul':
- branch: 'istanbul'
- - 'honolulu':
- branch: 'honolulu'
+ - "master":
+ branch: "master"
diff --git a/jjb/dmaap/dmaap-buscontroller.yaml b/jjb/dmaap/dmaap-buscontroller.yaml
index 6eee943..35b8852 100644
--- a/jjb/dmaap/dmaap-buscontroller.yaml
+++ b/jjb/dmaap/dmaap-buscontroller.yaml
@@ -7,74 +7,73 @@
- project:
name: dmaap-buscontroller-java
- project-name: 'dmaap-buscontroller'
+ project-name: "dmaap-buscontroller"
jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
+ - "{project-name}-{stream}-verify-java"
+ - "{project-name}-{stream}-merge-java"
- gerrit-maven-docker-stage:
build-node: ubuntu1804-docker-8c-8g
- mvn-goals: 'clean package -P docker docker:build docker:push -DskipTests=true'
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
- project: 'dmaap/buscontroller'
+ mvn-goals: "clean package -P docker docker:build docker:push -DskipTests=true"
+ container-public-registry: "nexus3.onap.org:10001"
+ container-staging-registry: "nexus3.onap.org:10003"
+ cron: ""
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
+ project: "dmaap/buscontroller"
stream:
- - 'master':
- branch: 'master'
- - 'kohn':
- branch: 'kohn'
- mvn-settings: 'dmaap-buscontroller-settings'
- files: '**'
- archive-artifacts: ''
+ - "master":
+ branch: "master"
+ - "kohn":
+ branch: "kohn"
+ mvn-settings: "dmaap-buscontroller-settings"
+ files: "**"
+ archive-artifacts: ""
java-version: openjdk11
- project:
name: dmaap-buscontroller-csit
jobs:
- - '{project-name}-review-verification-maven-{stream}':
- mvn-goals: clean install
- mvn-params: '-P docker -DskipTests=true'
- - '{project-name}-merge-verification-maven-{stream}':
- mvn-goals: clean install
- mvn-params: '-P docker -DskipTests=true'
- project-name: 'dmaap-buscontroller'
- recipients: 'fiachra.corcoran@est.tech'
- project: 'dmaap/buscontroller'
+ - "{project-name}-review-verification-maven-{stream}":
+ mvn-goals: clean install
+ mvn-params: "-P docker -DskipTests=true"
+ - "{project-name}-merge-verification-maven-{stream}":
+ mvn-goals: clean install
+ mvn-params: "-P docker -DskipTests=true"
+ project-name: "dmaap-buscontroller"
+ recipients: "fiachra.corcoran@est.tech"
+ project: "dmaap/buscontroller"
stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'dmaap-buscontroller-settings'
- robot-options: ''
+ - "master":
+ branch: "master"
+ mvn-settings: "dmaap-buscontroller-settings"
+ robot-options: ""
- project:
name: dmaap-buscontroller-sonar
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
build-node: ubuntu1804-builder-4c-4g
- project: 'dmaap/buscontroller'
- project-name: 'dmaap-buscontroller'
- branch: 'master'
- mvn-settings: 'dmaap-buscontroller-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ project: "dmaap/buscontroller"
+ project-name: "dmaap-buscontroller"
+ branch: "master"
+ mvn-settings: "dmaap-buscontroller-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
java-version: openjdk11
- project:
name: dmaap-buscontroller-clm
jobs:
- gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
+ nexus-iq-namespace: "onap-"
project: dmaap/buscontroller
- project-name: 'dmaap-buscontroller'
- branch: 'master'
- mvn-settings: 'dmaap-buscontroller-settings'
+ project-name: "dmaap-buscontroller"
+ branch: "master"
+ mvn-settings: "dmaap-buscontroller-settings"
java-version: openjdk11
- project:
@@ -82,6 +81,6 @@
project-name: dmaap-buscontroller
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: dmaap/buscontroller
branch: master
diff --git a/jjb/dmaap/dmaap-datarouter.yaml b/jjb/dmaap/dmaap-datarouter.yaml
index f325ed1..304e040 100644
--- a/jjb/dmaap/dmaap-datarouter.yaml
+++ b/jjb/dmaap/dmaap-datarouter.yaml
@@ -1,75 +1,74 @@
---
- project:
name: dmaap-datarouter-java
- project-name: 'dmaap-datarouter'
+ project-name: "dmaap-datarouter"
jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
+ - "{project-name}-{stream}-verify-java"
+ - "{project-name}-{stream}-merge-java"
- gerrit-maven-docker-stage:
build-node: ubuntu1804-docker-8c-8g
maven-versions-plugin: true
- mvn-goals: 'clean package -P docker docker:build docker:push'
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
- project: 'dmaap/datarouter'
+ mvn-goals: "clean package -P docker docker:build docker:push"
+ container-public-registry: "nexus3.onap.org:10001"
+ container-staging-registry: "nexus3.onap.org:10003"
+ cron: ""
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
+ project: "dmaap/datarouter"
stream:
- - 'master':
- branch: 'master'
- - 'kohn':
- branch: 'kohn'
- mvn-settings: 'dmaap-datarouter-settings'
- files: '**'
- archive-artifacts: ''
+ - "master":
+ branch: "master"
+ - "kohn":
+ branch: "kohn"
+ mvn-settings: "dmaap-datarouter-settings"
+ files: "**"
+ archive-artifacts: ""
java-version: openjdk11
- project:
name: dmaap-datarouter-csit-ssl
jobs:
- - '{project-name}-review-verification-maven-{stream}':
- mvn-goals: clean package
- mvn-params: '-P docker docker:build -DskipTests=false'
- - '{project-name}-merge-verification-maven-{stream}':
- mvn-goals: clean package
- mvn-params: '-P docker docker:build'
- project-name: 'dmaap-datarouter'
- recipients: 'fiachra.corcoran@est.tech'
- project: 'dmaap/datarouter'
+ - "{project-name}-review-verification-maven-{stream}":
+ mvn-goals: clean package
+ mvn-params: "-P docker docker:build -DskipTests=false"
+ - "{project-name}-merge-verification-maven-{stream}":
+ mvn-goals: clean package
+ mvn-params: "-P docker docker:build"
+ project-name: "dmaap-datarouter"
+ recipients: "fiachra.corcoran@est.tech"
+ project: "dmaap/datarouter"
stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'dmaap-datarouter-settings'
- robot-options: ''
+ - "master":
+ branch: "master"
+ mvn-settings: "dmaap-datarouter-settings"
+ robot-options: ""
- project:
name: dmaap-datarouter-sonar
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
build-node: ubuntu1804-builder-4c-4g
- project: 'dmaap/datarouter'
- project-name: 'dmaap-datarouter'
- branch: 'master'
- mvn-settings: 'dmaap-datarouter-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ project: "dmaap/datarouter"
+ project-name: "dmaap-datarouter"
+ branch: "master"
+ mvn-settings: "dmaap-datarouter-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
java-version: openjdk11
- project:
name: dmaap-datarouter-clm
jobs:
- gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
+ nexus-iq-namespace: "onap-"
project: dmaap/datarouter
- project-name: 'dmaap-datarouter'
- branch: 'master'
- mvn-settings: 'dmaap-datarouter-settings'
+ project-name: "dmaap-datarouter"
+ branch: "master"
+ mvn-settings: "dmaap-datarouter-settings"
java-version: openjdk11
- project:
@@ -77,6 +76,6 @@
project-name: dmaap-datarouter
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: dmaap/datarouter
branch: master
diff --git a/jjb/dmaap/dmaap-kafka-client.yaml b/jjb/dmaap/dmaap-kafka-client.yaml
new file mode 100644
index 0000000..bc7a578
--- /dev/null
+++ b/jjb/dmaap/dmaap-kafka-client.yaml
@@ -0,0 +1,59 @@
+---
+- project:
+ name: dmaap-kafka-client
+ project-name: "dmaap-kafka-client"
+ jobs:
+ - "{project-name}-{stream}-verify-java"
+ - "{project-name}-{stream}-merge-java"
+ - gerrit-maven-stage:
+ sign-artifacts: true
+ build-node: centos8-docker-4c-4g
+ maven-versions-plugin: true
+ cron: ""
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
+ project: "dmaap/kafka11aaf"
+ stream:
+ - "master":
+ branch: "master"
+ mvn-settings: "dmaap-kafka11aaf-settings"
+ files: "**"
+ archive-artifacts: ""
+ java-version: openjdk11
+
+- project:
+ name: dmaap-kafka-client-sonar
+ jobs:
+ - gerrit-maven-sonar
+ sonarcloud: true
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ build-node: ubuntu1804-builder-4c-4g
+ project: "dmaap/kafka11aaf"
+ project-name: "dmaap-kafka-client"
+ branch: "master"
+ mvn-settings: "dmaap-kafka11aaf-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
+ java-version: openjdk11
+
+- project:
+ name: dmaap-kafka-client-clm
+ jobs:
+ - gerrit-maven-clm
+ nexus-iq-namespace: "onap-"
+ project: "dmaap/kafka11aaf"
+ project-name: "dmaap-kafka-client"
+ branch: "master"
+ mvn-settings: "dmaap-kafka11aaf-settings"
+ java-version: openjdk11
+
+- project:
+ name: dmaap-kafka-client-info
+ project-name: dmaap-kafka-client
+ jobs:
+ - gerrit-info-yaml-verify
+ build-node: centos8-builder-2c-1g
+ project: dmaap/kafka11aaf
+ branch: master
diff --git a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
index 0ac9a22..47dff2f 100644
--- a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
@@ -1,25 +1,26 @@
---
- project:
name: dmaap-messagerouter-dmaapclient-java
- project-name: 'dmaap-messagerouter-dmaapclient-java'
+ project-name: "dmaap-messagerouter-dmaapclient-java"
jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
+ - "{project-name}-{stream}-verify-java"
+ - "{project-name}-{stream}-merge-java"
- gerrit-maven-stage:
sign-artifacts: true
- build-node: centos7-builder-4c-4g
+ build-node: centos8-docker-4c-4g
maven-versions-plugin: true
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
- project: 'dmaap/messagerouter/dmaapclient'
+ cron: ""
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
+ project: "dmaap/messagerouter/dmaapclient"
stream:
- - 'master':
- branch: 'master'
- - 'kohn':
- branch: 'kohn'
- mvn-settings: 'dmaap-messagerouter-dmaapclient-settings'
- files: '**'
- archive-artifacts: ''
+ - "master":
+ branch: "master"
+ - "kohn":
+ branch: "kohn"
+ mvn-settings: "dmaap-messagerouter-dmaapclient-settings"
+ files: "**"
+ archive-artifacts: ""
java-version: openjdk11
- project:
@@ -27,29 +28,27 @@
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
build-node: ubuntu1804-builder-4c-4g
- project: 'dmaap/messagerouter/dmaapclient'
- project-name: 'dmaap-messagerouter-dmaapclient'
- branch: 'master'
- mvn-settings: 'dmaap-messagerouter-dmaapclient-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ project: "dmaap/messagerouter/dmaapclient"
+ project-name: "dmaap-messagerouter-dmaapclient"
+ branch: "master"
+ mvn-settings: "dmaap-messagerouter-dmaapclient-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
java-version: openjdk11
- project:
name: dmaap-messagerouter-dmaapclient-clm
jobs:
- gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
+ nexus-iq-namespace: "onap-"
project: dmaap/messagerouter/dmaapclient
- project-name: 'dmaap-messagerouter-dmaapclient'
- branch: 'master'
- mvn-settings: 'dmaap-messagerouter-dmaapclient-settings'
+ project-name: "dmaap-messagerouter-dmaapclient"
+ branch: "master"
+ mvn-settings: "dmaap-messagerouter-dmaapclient-settings"
java-version: openjdk11
- project:
@@ -57,6 +56,6 @@
project-name: dmaap-messagerouter-dmaapclient
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: dmaap/messagerouter/dmaapclient
branch: master
diff --git a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
index c3755de..c700779 100644
--- a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
@@ -1,79 +1,78 @@
---
- project:
name: dmaap-messagerouter-messageservice-java
- project-name: 'dmaap-messagerouter-messageservice-java'
+ project-name: "dmaap-messagerouter-messageservice-java"
jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
+ - "{project-name}-{stream}-verify-java"
+ - "{project-name}-{stream}-merge-java"
- gerrit-maven-docker-stage:
build-node: ubuntu1804-docker-8c-8g
- mvn-params: '-P docker -Dmaven.test.skip=true'
+ mvn-params: "-P docker -Dmaven.test.skip=true"
maven-versions-plugin: true
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
- project: 'dmaap/messagerouter/messageservice'
+ container-public-registry: "nexus3.onap.org:10001"
+ container-staging-registry: "nexus3.onap.org:10003"
+ cron: ""
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
+ project: "dmaap/messagerouter/messageservice"
stream:
- - 'master':
- branch: 'master'
- - 'kohn':
- branch: 'kohn'
- mvn-settings: 'dmaap-messagerouter-messageservice-settings'
+ - "master":
+ branch: "master"
+ - "kohn":
+ branch: "kohn"
+ mvn-settings: "dmaap-messagerouter-messageservice-settings"
java-version: openjdk11
- files: '**'
- archive-artifacts: ''
- docker-pom: 'pom.xml'
- mvn-profile: 'docker'
+ files: "**"
+ archive-artifacts: ""
+ docker-pom: "pom.xml"
+ mvn-profile: "docker"
- project:
name: dmaap-csit
jobs:
- - '{project-name}-review-verification-maven-{stream}':
- mvn-goals: clean deploy
- mvn-params: '-P docker -Dskip.deploy=true -Dskip.docker.push=true'
- - '{project-name}-merge-verification-maven-{stream}':
- mvn-goals: clean deploy
- mvn-params: '-P docker -DskipTests=true -Dskip.deploy=true -Dskip.docker.push=true'
- project-name: 'dmaap-messagerouter-messageservice'
- project: 'dmaap/messagerouter/messageservice'
- recipients: 'fiachra.corcoran@est.tech'
+ - "{project-name}-review-verification-maven-{stream}":
+ mvn-goals: clean deploy
+ mvn-params: "-P docker -Dskip.deploy=true -Dskip.docker.push=true"
+ - "{project-name}-merge-verification-maven-{stream}":
+ mvn-goals: clean deploy
+ mvn-params: "-P docker -DskipTests=true -Dskip.deploy=true -Dskip.docker.push=true"
+ project-name: "dmaap-messagerouter-messageservice"
+ project: "dmaap/messagerouter/messageservice"
+ recipients: "fiachra.corcoran@est.tech"
stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'dmaap-messagerouter-messageservice-settings'
- robot-options: ''
+ - "master":
+ branch: "master"
+ mvn-settings: "dmaap-messagerouter-messageservice-settings"
+ robot-options: ""
- project:
name: dmaap-messagerouter-messageservice-sonar
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
build-node: ubuntu1804-builder-4c-4g
- project: 'dmaap/messagerouter/messageservice'
- project-name: 'dmaap-messagerouter-messageservice'
- branch: 'master'
- mvn-settings: 'dmaap-messagerouter-messageservice-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ project: "dmaap/messagerouter/messageservice"
+ project-name: "dmaap-messagerouter-messageservice"
+ branch: "master"
+ mvn-settings: "dmaap-messagerouter-messageservice-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
java-version: openjdk11
- project:
name: dmaap-messagerouter-messageservice-clm
jobs:
- gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
+ nexus-iq-namespace: "onap-"
project: dmaap/messagerouter/messageservice
- project-name: 'dmaap-messagerouter-messageservice'
+ project-name: "dmaap-messagerouter-messageservice"
stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'dmaap-messagerouter-messageservice-settings'
+ - "master":
+ branch: "master"
+ mvn-settings: "dmaap-messagerouter-messageservice-settings"
java-version: openjdk11
- project:
@@ -81,6 +80,6 @@
project-name: dmaap-messagerouter-messageservice
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: dmaap/messagerouter/messageservice
branch: master
diff --git a/jjb/doc/doc.yaml b/jjb/doc/doc.yaml
index ad3cea7..856d017 100644
--- a/jjb/doc/doc.yaml
+++ b/jjb/doc/doc.yaml
@@ -10,6 +10,6 @@
project-name: doc
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: doc
branch: master
diff --git a/jjb/doc/rules.yaml b/jjb/doc/rules.yaml
new file mode 100644
index 0000000..aa17f68
--- /dev/null
+++ b/jjb/doc/rules.yaml
@@ -0,0 +1,159 @@
+---
+- scm:
+ name: doc-scm
+ scm:
+ - git:
+ url: "https://gerrit.onap.org/r/{project}"
+ refspec: "+refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*"
+ branches:
+ - "{ref}"
+
+- trigger:
+ name: doc-rules-patchset-created
+ triggers:
+ - gerrit:
+ trigger-on:
+ - patchset-created-event
+ - comment-added-contains-event:
+ comment-contains-value: recheck
+ - comment-added-contains-event:
+ comment-contains-value: reverify
+ server-name: "Primary"
+ projects:
+ - project-compare-type: "ANT"
+ project-pattern: "**"
+ branches:
+ - branch-compare-type: "ANT"
+ branch-pattern: "**/*"
+ - branch-compare-type: "ANT"
+ branch-pattern: "refs/tags/**"
+
+- builder:
+ name: doc-rules
+ builders:
+ # yamllint disable rule:line-length
+ - shell: |
+ #!/bin/bash
+ . /lib/lsb/init-functions || exit 0
+ exitstatus="0"
+ warning="0"
+ # message, begin
+ log_success_msg "INFO Starting additional checks related to documentation."
+ log_success_msg "INFO See https://git.onap.org/doc/doc-best-practice for example config files (master branch)."
+ log_success_msg "INFO Modify example config files if you like to use them in a release branch."
+ log_success_msg "INFO See https://wiki.onap.org/x/w4IEBw for the detailed procedure #02."
+ log_success_msg "INFO In case of questions please contact the ONAP documentation team."
+ # docs directory
+ if [ ! -d docs ] ; then
+ log_success_msg "INFO Directory docs not found. Skipping further checks."
+ exit 0
+ fi
+ # config files, required
+ for i in docs/index.rst docs/conf.py docs/requirements-docs.txt docs/_static/css/ribbon.css; do
+ if [ ! -f $i ] ; then
+ log_failure_msg "FAIL $i missing. Please add it or remove the full docs directory."
+ exitstatus="1"
+ else
+ log_success_msg "INFO $i found."
+ fi
+ done
+ # config files, no longer required
+ for i in docs/conf.yaml; do
+ if [ -f $i ] ; then
+ log_failure_msg "FAIL $i found. It is no longer required. Please remove it."
+ exitstatus="1"
+ else
+ log_success_msg "INFO $i not found."
+ fi
+ done
+ # tox.ini @ docs directory
+ filename="docs/tox.ini"
+ if [ ! -f $filename ] ; then
+ log_failure_msg "FAIL $filename missing. Please add it or remove the full docs directory."
+ exitstatus="1"
+ else
+ log_success_msg "INFO $filename found."
+ # sphinx-build command and -W option
+ sphinxbuild_detected=0
+ linenumber=0
+ while IFS="" read -r line || [ -n "$line" ] ; do
+ linenumber=$((linenumber+1))
+ if echo $line | grep -q '^[ \t]*sphinx-build.*' ; then
+ sphinxbuild_detected="1"
+ if echo $line | grep -q '^[ \t]*sphinx-build.* -W ' ; then
+ log_success_msg "INFO sphinx-build option '-W' used in $filename, line $linenumber."
+ elif echo $line | grep -q ' \-b spelling ' ; then
+ log_warning_msg "WARN sphinx-build option '-W' missing for spellcheck in $filename, line $linenumber."
+ warning="1"
+ else
+ log_failure_msg "FAIL sphinx-build option '-W' missing in $filename, line $linenumber. Please add it."
+ exitstatus="1"
+ fi
+ fi
+ done < $filename
+ if [ "$sphinxbuild_detected" = "0" ]; then
+ log_failure_msg "FAIL Sphinx-build command(s) missing in $filename. Please add it."
+ exitstatus="1"
+ fi
+ # second tox.ini @ root directory
+ if [ -f ./tox.ini ] ; then
+ # sphinx-build command
+ if cat ./tox.ini | grep -q '^[ \t]*sphinx-build.*' ; then
+ log_warning_msg "WARN tox.ini also exists in root directory and contains sphinx-build command(s). Please check for redundancies."
+ warning="1"
+ fi
+ fi
+ unset sphinxbuild_detected
+ unset linenumber
+ fi
+ unset filename
+ # ribbon.css
+ filename="docs/_static/css/ribbon.css"
+ if [ ! -f $filename ]; then
+ log_failure_msg "FAIL $filename missing. Please add it or remove the full docs directory."
+ exitstatus="1"
+ else
+ log_success_msg "INFO $filename found."
+ # max-width parameter
+ cssmaxwidth=$(grep '^[ \t]*max-width:' $filename | sed -e 's/^[ \t]*//' | sed -e 's/;$//');
+ if [[ ! $cssmaxwidth == *"max-width: 800px"* ]]; then
+ log_failure_msg "FAIL Setting 'max-width: 800px' missing in $filename. Please add it."
+ exitstatus="1"
+ else
+ log_success_msg "INFO Setting 'max-width: 800px' found in $filename."
+ fi
+ unset cssmaxwidth
+ fi
+ unset filename
+ # message, end
+ if [ "$exitstatus" = "0" ]; then
+ if [ "$warning" = "0" ]; then
+ log_success_msg "INFO Congratulations! No documentation problem(s) detected."
+ else
+ log_warning_msg "WARN No major documentation problem(s) detected but there are warnings!"
+ fi
+ else
+ if [ ! "$warning" = "0" ]; then
+ log_warning_msg "WARN Please check the detected documentation warning(s)!"
+ fi
+ log_failure_msg "FAIL Please fix the detected documentation problem(s)!"
+ fi
+ exit $exitstatus
+ # yamllint enable
+
+- job-template:
+ name: doc-rules
+ node: ubuntu1804-docker-8c-8g
+ triggers:
+ - doc-rules-patchset-created
+ scm:
+ - doc-scm:
+ ref: $GERRIT_REFSPEC
+ project: $GERRIT_PROJECT
+ builders:
+ - doc-rules
+
+- project:
+ name: "doc-rules"
+ jobs:
+ - "doc-rules"
diff --git a/jjb/externalapi/externalapi-nbi.yaml b/jjb/externalapi/externalapi-nbi.yaml
index 6bda3cb..61e5280 100644
--- a/jjb/externalapi/externalapi-nbi.yaml
+++ b/jjb/externalapi/externalapi-nbi.yaml
@@ -7,61 +7,44 @@
- project:
name: externalapi-nbi
- project-name: 'externalapi-nbi'
+ project-name: "externalapi-nbi"
jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
+ - "{project-name}-{stream}-verify-java"
+ - "{project-name}-{stream}-merge-java"
- gerrit-maven-stage:
sign-artifacts: true
- build-node: centos7-docker-8c-8g
+ build-node: centos8-docker-8c-8g
maven-versions-plugin: true
- mvn-params: '-Dmaven.test.skip=true'
+ mvn-params: "-Dmaven.test.skip=true"
- gerrit-maven-docker-stage:
build-node: ubuntu1804-docker-8c-8g
maven-versions-plugin: true
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
- mvn-params: '-Dmaven.test.skip=true -P docker'
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
- project: 'externalapi/nbi'
+ container-public-registry: "nexus3.onap.org:10001"
+ container-staging-registry: "nexus3.onap.org:10003"
+ mvn-params: "-Dmaven.test.skip=true -P docker"
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
+ project: "externalapi/nbi"
stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'externalapi-nbi-settings'
+ - "master":
+ branch: "master"
+ mvn-settings: "externalapi-nbi-settings"
java-version: openjdk11
- files: '**'
- archive-artifacts: ''
+ files: "**"
+ archive-artifacts: ""
build-node: ubuntu1804-builder-4c-4g
- project:
- name: externalapi-nbi-arm64
- project-name: 'externalapi-nbi-arm64'
- jobs:
- - '{project-name}-{stream}-docker-version-java-daily':
- docker-pom: 'pom.xml'
- mvn-profile: 'docker'
- mvn-params: '-Dmaven.test.skip=true'
- build-node: 'ubuntu1804-docker-arm64-4c-2g'
- project: 'externalapi/nbi'
- stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'externalapi-nbi-settings'
- files: '**'
- archive-artifacts: ''
-
-- project:
name: externalapi-nbi-clm
jobs:
- gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
- project: 'externalapi/nbi'
- project-name: 'externalapi-nbi'
+ nexus-iq-namespace: "onap-"
+ project: "externalapi/nbi"
+ project-name: "externalapi-nbi"
stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'externalapi-nbi-settings'
+ - "master":
+ branch: "master"
+ mvn-settings: "externalapi-nbi-settings"
java-version: openjdk11
- project:
@@ -69,18 +52,17 @@
jobs:
- gerrit-maven-sonar-prescan-script
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
build-node: ubuntu1804-builder-4c-4g
- project: 'externalapi/nbi'
- project-name: 'externalapi-nbi'
- branch: 'master'
- mvn-settings: 'externalapi-nbi-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ project: "externalapi/nbi"
+ project-name: "externalapi-nbi"
+ branch: "master"
+ mvn-settings: "externalapi-nbi-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
java-version: openjdk11
sonar-prescan-script: !include-raw-escape: ../ubuntu-latest-nodejs.sh
@@ -89,6 +71,6 @@
project-name: externalapi-nbi
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: externalapi/nbi
branch: master
diff --git a/jjb/global-defaults.yaml b/jjb/global-defaults.yaml
index f285698..b35c0f3 100644
--- a/jjb/global-defaults.yaml
+++ b/jjb/global-defaults.yaml
@@ -21,44 +21,42 @@
packer-version: 1.3.1
# default gerrit server definition
- server-name: 'Primary'
- gerrit-server-name: 'Primary'
+ server-name: "Primary"
+ gerrit-server-name: "Primary"
# Java
- jdk: ''
+ jdk: ""
# Maven
- mvn-params: ''
- mvn-staging-id: 'ecomp-staging'
+ mvn-params: ""
+ mvn-staging-id: "ecomp-staging"
onap-infra-mvn-opts: |
- --show-version
- --batch-mode
- -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
- -Djenkins
- -Dmaven.repo.local=/tmp/r
- -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
+ --show-version
+ --batch-mode
+ -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
+ -Djenkins
+ -Dmaven.repo.local=/tmp/r
+ -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
staging-profile-id: 176c31dfe190a
-
# Timeout in minutes
build-timeout: 90
build-node: ubuntu1804-builder-4c-4g
- archive-artifacts: ''
+ archive-artifacts: ""
# Set default maven version used for everything
- maven-version: 'mvn33'
+ maven-version: "mvn33"
# git submodule attributes
submodule-recursive: true
submodule-disable: false
# Jenkins
- jenkins-ssh-credential: 'onap-jenkins-ssh'
- jenkins-ssh-release-credential: 'jenkins-release'
+ jenkins-ssh-credential: "onap-jenkins-ssh"
+ jenkins-ssh-release-credential: "jenkins-release"
# SonarCloud
sonarcloud_project_organization: onap
- sonarcloud_api_token: da97604dfdc36ec82488a97ebea96ad01f7b10ff
sonar_mvn_goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.9.1.2184:sonar"
# Nexus3 docker registries
@@ -66,4 +64,4 @@
container-snapshot-registry: nexus3.onap.org:10003
container-staging-registry: nexus3.onap.org:10004
# the quotes here are REQUIRED
- container-push-registry: '{container-snapshot-registry}'
+ container-push-registry: "{container-snapshot-registry}"
diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml
index 50a9a57..8fb7afe 100644
--- a/jjb/global-macros.yaml
+++ b/jjb/global-macros.yaml
@@ -9,10 +9,10 @@
builders:
- config-file-provider:
files:
- - file-id: '{global-settings-file}'
- variable: 'GLOBAL_SETTINGS_FILE'
- - file-id: '{settings-file}'
- variable: 'SETTINGS_FILE'
+ - file-id: "{global-settings-file}"
+ variable: "GLOBAL_SETTINGS_FILE"
+ - file-id: "{settings-file}"
+ variable: "SETTINGS_FILE"
# call maven-target builder with a goal of --version to force Jenkins to
# install the needed maven version
@@ -20,33 +20,33 @@
name: maven-install
builders:
- maven-target:
- maven-version: '{maven-version}'
- goals: '--version'
+ maven-version: "{maven-version}"
+ goals: "--version"
- builder:
name: maven-set-release-version
builders:
- maven-target:
- maven-version: '{maven-version}'
- pom: '{pom}'
- goals: 'versions:set versions:update-child-modules versions:commit -B'
+ maven-version: "{maven-version}"
+ pom: "{pom}"
+ goals: "versions:set versions:update-child-modules versions:commit -B"
properties:
- - 'newVersion=${{release_version}}'
- settings: '{mvn-settings}'
+ - "newVersion=${{release_version}}"
+ settings: "{mvn-settings}"
settings-type: cfp
- global-settings: 'global-settings'
+ global-settings: "global-settings"
global-settings-type: cfp
- builder:
name: maven-docker-push-release
builders:
- maven-target:
- maven-version: '{maven-version}'
- pom: '{pom}'
- goals: 'clean deploy -B -P {mvn-profile}'
- settings: '{mvn-settings}'
+ maven-version: "{maven-version}"
+ pom: "{pom}"
+ goals: "clean deploy -B -P {mvn-profile}"
+ settings: "{mvn-settings}"
settings-type: cfp
- global-settings: 'global-settings'
+ global-settings: "global-settings"
global-settings-type: cfp
properties:
- maven.test.skip=true
@@ -57,12 +57,12 @@
name: maven-docker-push-daily
builders:
- maven-target:
- maven-version: '{maven-version}'
- pom: '{pom}'
- goals: 'clean deploy -B -P {mvn-profile} {mvn-params}'
- settings: '{mvn-settings}'
+ maven-version: "{maven-version}"
+ pom: "{pom}"
+ goals: "clean deploy -B -P {mvn-profile} {mvn-params}"
+ settings: "{mvn-settings}"
settings-type: cfp
- global-settings: 'global-settings'
+ global-settings: "global-settings"
global-settings-type: cfp
properties:
- docker.pull.registry=nexus3.onap.org:10001
@@ -78,8 +78,7 @@
builders:
- inject:
properties-content: PYPI_SERVER={pypi-server}
- - shell:
- !include-raw-escape: ../shell/pypi-publish.sh
+ - shell: !include-raw-escape: ../shell/pypi-publish.sh
# PARAMETERS
- parameter:
@@ -87,39 +86,39 @@
parameters:
- string:
name: PROJECT
- default: '{project}'
+ default: "{project}"
# yamllint disable rule:line-length
- description: 'JJB configured PROJECT parameter to identify a Gerrit project'
+ description: "JJB configured PROJECT parameter to identify a Gerrit project"
# yamllint enable
- string:
name: ARCHIVE_ARTIFACTS
- default: '{artifacts} **/target/surefire-reports/*-output.txt'
+ default: "{artifacts} **/target/surefire-reports/*-output.txt"
# yamllint disable rule:line-length
- description: 'Space separated glob patterns for artifacts to archive to logs hosting'
+ description: "Space separated glob patterns for artifacts to archive to logs hosting"
# yamllint enable
- string:
name: GERRIT_BRANCH
- default: '{branch}'
- description: 'JJB configured GERRIT_BRANCH parameter'
+ default: "{branch}"
+ description: "JJB configured GERRIT_BRANCH parameter"
- string:
name: GERRIT_PROJECT
- default: '{project}'
- description: 'GERRIT_PROJECT parameter if not given by trigger'
+ default: "{project}"
+ description: "GERRIT_PROJECT parameter if not given by trigger"
- string:
name: GERRIT_REFSPEC
- default: '{refspec}'
- description: 'GERRIT_REFSPEC parameter if not given by trigger'
+ default: "{refspec}"
+ description: "GERRIT_REFSPEC parameter if not given by trigger"
- string:
name: STACK_NAME
- default: '$JOB_NAME-$BUILD_NUMBER'
- description: 'Used by Heat to generate a unique stack & vm name'
+ default: "$JOB_NAME-$BUILD_NUMBER"
+ description: "Used by Heat to generate a unique stack & vm name"
- parameter:
name: maven-params
parameters:
- string:
name: MAVEN_PARAMS
- default: '{mvn-params}'
+ default: "{mvn-params}"
description: Maven parameters to pass to the mvn command.
- parameter:
@@ -128,9 +127,9 @@
- string:
name: MVN
# yamllint disable rule:line-length
- default: '/w/tools/hudson.tasks.Maven_MavenInstallation/{maven-version}/bin/mvn'
+ default: "/w/tools/hudson.tasks.Maven_MavenInstallation/{maven-version}/bin/mvn"
# yamllint enable
- description: 'Maven selector to be used by shell scripts'
+ description: "Maven selector to be used by shell scripts"
- parameter:
name: docker-image-name
@@ -138,16 +137,16 @@
- string:
name: DOCKER_IMAGE_NAME
# yamllint disable rule:line-length
- default: '{docker-image-name}'
+ default: "{docker-image-name}"
# yamllint enable
- description: 'Docker image name, e.g. onap/appc'
+ description: "Docker image name, e.g. onap/appc"
# PROPERTIES
- property:
name: infra-properties
properties:
- build-discarder:
- days-to-keep: '{build-days-to-keep}'
+ days-to-keep: "{build-days-to-keep}"
num-to-keep: 40
artifact-days-to-keep: -1
artifact-num-to-keep: 5
@@ -157,7 +156,7 @@
name: archive-artifacts
publishers:
- archive:
- artifacts: '{artifacts}'
+ artifacts: "{artifacts}"
allow-empty: true
fingerprint: true
latest-only: true
@@ -166,11 +165,11 @@
name: email-notification
publishers:
- email-ext:
- recipients: 'nobody@open-o.org'
+ recipients: "nobody@open-o.org"
reply-to:
content-type: default
# yamllint disable rule:line-length
- subject: '{email-prefix} $PROJECT_NAME - Build # $BUILD_NUMBER - $BUILD_STATUS!'
+ subject: "{email-prefix} $PROJECT_NAME - Build # $BUILD_NUMBER - $BUILD_STATUS!"
# yamllint enable
body: |
$PROJECT_NAME - Build # $BUILD_NUMBER - $BUILD_STATUS:
@@ -186,11 +185,11 @@
name: jacoco-report
publishers:
- jacoco:
- exec-pattern: '**/**.exec'
- class-pattern: '**/classes'
- source-pattern: '**/src/main/java'
+ exec-pattern: "**/**.exec"
+ class-pattern: "**/classes"
+ source-pattern: "**/src/main/java"
# yamllint disable rule:line-length
- exclusion-pattern: '**/gen**,**/generated-sources/**,**/yang-gen**,**/pax/**'
+ exclusion-pattern: "**/gen**,**/generated-sources/**,**/yang-gen**,**/pax/**"
# yamllint enable
status-update: true
targets:
@@ -205,10 +204,10 @@
name: checkstyle-result
publishers:
- checkstyle:
- pattern: '**/checkstyle-result.xml'
+ pattern: "**/checkstyle-result.xml"
healthy: 0
unhealthy: 100
- health-threshold: 'high'
+ health-threshold: "high"
thresholds:
unstable:
total-all: 30
@@ -224,10 +223,10 @@
name: checkstyle-result-daily
publishers:
- checkstyle:
- pattern: '**/checkstyle-result.xml'
+ pattern: "**/checkstyle-result.xml"
healthy: 0
unhealthy: 100
- health-threshold: 'high'
+ health-threshold: "high"
thresholds:
unstable:
total-all: 30
@@ -244,11 +243,11 @@
name: git-scm
scm:
- git:
- credentials-id: 'onap-jenkins-ssh'
- url: '$GIT_BASE'
- refspec: ''
+ credentials-id: "onap-jenkins-ssh"
+ url: "$GIT_BASE"
+ refspec: ""
branches:
- - 'origin/{branch}'
+ - "origin/{branch}"
skip-tag: true
wipe-workspace: true
timeout: 30
@@ -257,40 +256,40 @@
name: gerrit-trigger-scm
scm:
- git:
- credentials-id: 'onap-jenkins-ssh'
- url: '$GIT_BASE'
- refspec: '{refspec}'
+ credentials-id: "onap-jenkins-ssh"
+ url: "$GIT_BASE"
+ refspec: "{refspec}"
branches:
- - 'origin/$GERRIT_BRANCH'
+ - "origin/$GERRIT_BRANCH"
skip-tag: true
timeout: 30
- choosing-strategy: '{choosing-strategy}'
+ choosing-strategy: "{choosing-strategy}"
submodule:
- recursive: '{submodule-recursive}'
+ recursive: "{submodule-recursive}"
- scm:
name: gerrit-trigger-scm-basedir
scm:
- git:
- credentials-id: 'onap-jenkins-ssh'
- url: '$GIT_BASE'
- refspec: '{refspec}'
+ credentials-id: "onap-jenkins-ssh"
+ url: "$GIT_BASE"
+ refspec: "{refspec}"
branches:
- - 'origin/$GERRIT_BRANCH'
+ - "origin/$GERRIT_BRANCH"
skip-tag: true
timeout: 30
- choosing-strategy: '{choosing-strategy}'
- basedir: '{basedir}'
+ choosing-strategy: "{choosing-strategy}"
+ basedir: "{basedir}"
- scm:
name: git-branch-scm
scm:
- git:
- credentials-id: 'onap-jenkins-ssh'
- url: '$GIT_BASE'
- refspec: ''
+ credentials-id: "onap-jenkins-ssh"
+ url: "$GIT_BASE"
+ refspec: ""
branches:
- - 'origin/{branch}'
+ - "origin/{branch}"
skip-tag: true
timeout: 30
wipe-workspace: true
@@ -299,15 +298,15 @@
name: git-extra-project
scm:
- git:
- credentials-id: 'onap-jenkins-ssh'
- url: '$GIT_NO_PROJECT/{project}'
- refspec: '{refspec}'
+ credentials-id: "onap-jenkins-ssh"
+ url: "$GIT_NO_PROJECT/{project}"
+ refspec: "{refspec}"
branches:
- - 'origin/{branch}'
+ - "origin/{branch}"
skip-tag: true
timeoute: 30
wipe-workspace: false
- basedir: '{checkout-dir}'
+ basedir: "{checkout-dir}"
# TRIGGERS
@@ -324,112 +323,111 @@
name: gerrit-trigger-patch-submitted
triggers:
- gerrit:
- server-name: '{server}'
+ server-name: "{server}"
trigger-on:
- patchset-created-event:
- exclude-drafts: 'false'
- exclude-trivial-rebase: 'false'
- exclude-no-code-change: 'false'
+ exclude-drafts: "false"
+ exclude-trivial-rebase: "false"
+ exclude-no-code-change: "false"
- draft-published-event
- comment-added-contains-event:
- comment-contains-value: 'recheck'
+ comment-contains-value: "recheck"
projects:
- - project-compare-type: 'ANT'
- project-pattern: '{project}'
+ - project-compare-type: "ANT"
+ project-pattern: "{project}"
branches:
- - branch-compare-type: 'ANT'
- branch-pattern: '**/{branch}'
+ - branch-compare-type: "ANT"
+ branch-pattern: "**/{branch}"
file-paths:
- - compare-type: 'ANT'
- pattern: '{files}'
+ - compare-type: "ANT"
+ pattern: "{files}"
- trigger:
name: gerrit-trigger-patch-merged
triggers:
- gerrit:
- server-name: '{server}'
+ server-name: "{server}"
trigger-on:
- change-merged-event
- comment-added-contains-event:
- comment-contains-value: 'remerge'
+ comment-contains-value: "remerge"
projects:
- - project-compare-type: 'ANT'
- project-pattern: '{project}'
+ - project-compare-type: "ANT"
+ project-pattern: "{project}"
branches:
- - branch-compare-type: 'ANT'
- branch-pattern: '**/{branch}'
+ - branch-compare-type: "ANT"
+ branch-pattern: "**/{branch}"
file-paths:
- - compare-type: 'ANT'
- pattern: '{files}'
+ - compare-type: "ANT"
+ pattern: "{files}"
- trigger:
name: gerrit-trigger-helm-patch-submitted
triggers:
- gerrit:
- server-name: '{server}'
+ server-name: "{server}"
trigger-on:
- patchset-created-event:
- exclude-drafts: 'false'
- exclude-no-code-change: 'false'
- exclude-trivial-rebase: 'true'
- exclude-wip: 'true'
+ exclude-drafts: "false"
+ exclude-no-code-change: "false"
+ exclude-trivial-rebase: "false"
+ exclude-wip: "true"
- draft-published-event
- comment-added-contains-event:
comment-contains-value: '^Patch Set\s+\d+:\s+(recheck|reverify|verify-helm)\s*$'
projects:
- - project-compare-type: 'ANT'
- project-pattern: '{project}'
+ - project-compare-type: "ANT"
+ project-pattern: "{project}"
branches:
- - branch-compare-type: 'ANT'
- branch-pattern: '**/{branch}'
+ - branch-compare-type: "ANT"
+ branch-pattern: "**/{branch}"
file-paths:
- - compare-type: 'ANT'
- pattern: '{files}'
+ - compare-type: "ANT"
+ pattern: "{files}"
- trigger:
name: gerrit-trigger-helm-patch-merged
triggers:
- gerrit:
- server-name: '{server}'
+ server-name: "{server}"
trigger-on:
- change-merged-event
- comment-added-contains-event:
- comment-contains-value: '^remerge-helm$'
+ comment-contains-value: "^remerge-helm$"
projects:
- - project-compare-type: 'ANT'
- project-pattern: '{project}'
+ - project-compare-type: "ANT"
+ project-pattern: "{project}"
branches:
- - branch-compare-type: 'ANT'
- branch-pattern: '**/{branch}'
+ - branch-compare-type: "ANT"
+ branch-pattern: "**/{branch}"
file-paths:
- - compare-type: 'ANT'
- pattern: '{files}'
+ - compare-type: "ANT"
+ pattern: "{files}"
- trigger:
name: gerrit-trigger-release-manually
triggers:
- gerrit:
- server-name: '{server}'
+ server-name: "{server}"
trigger-on:
- comment-added-contains-event:
- comment-contains-value: 'please release'
+ comment-contains-value: "please release"
projects:
- - project-compare-type: 'ANT'
- project-pattern: '{project}'
+ - project-compare-type: "ANT"
+ project-pattern: "{project}"
branches:
- - branch-compare-type: 'ANT'
- branch-pattern: '**/{branch}'
+ - branch-compare-type: "ANT"
+ branch-pattern: "**/{branch}"
file-paths:
- - compare-type: 'ANT'
- pattern: '**'
+ - compare-type: "ANT"
+ pattern: "**"
- trigger:
name: trigger-on-build-success
triggers:
- reverse:
- jobs: '{job-name}'
- result: 'success'
-
+ jobs: "{job-name}"
+ result: "success"
# WRAPPERS
- wrapper:
@@ -484,12 +482,12 @@
- timestamps
- timeout:
type: absolute
- timeout: '{build-timeout}'
- timeout-var: 'BUILD_TIMEOUT'
+ timeout: "{build-timeout}"
+ timeout-var: "BUILD_TIMEOUT"
fail: true
- ssh-agent-credentials:
users:
- - 'onap-jenkins-ssh'
+ - "onap-jenkins-ssh"
- openstack:
single-use: true
@@ -501,11 +499,11 @@
- timestamps
- timeout:
type: absolute
- timeout: '{build-timeout}'
- timeout-var: 'BUILD_TIMEOUT'
+ timeout: "{build-timeout}"
+ timeout-var: "BUILD_TIMEOUT"
fail: true
- ssh-agent-credentials:
users:
- - 'onap-jenkins-ssh'
+ - "onap-jenkins-ssh"
- openstack:
single-use: false
diff --git a/jjb/global-templates-c.yaml b/jjb/global-templates-c.yaml
index f78cce7..7e25869 100644
--- a/jjb/global-templates-c.yaml
+++ b/jjb/global-templates-c.yaml
@@ -3,7 +3,7 @@
# COMMON FUNCTIONS #
####################
-- c_job_common: &c_job_common
+- _c_job_common: &c_job_common
name: c-job-common
######################
@@ -20,34 +20,34 @@
#####################
project-type: freestyle
- node: '{build-node}'
+ node: "{build-node}"
disabled: false
properties:
- infra-properties:
- build-days-to-keep: '{build-days-to-keep}'
+ build-days-to-keep: "{build-days-to-keep}"
parameters:
- lf-infra-parameters:
- project: '{project}'
- branch: '{branch}'
- stream: '{stream}'
+ project: "{project}"
+ branch: "{branch}"
+ stream: "{stream}"
scm:
- lf-infra-gerrit-scm:
- jenkins-ssh-credential: '{jenkins-ssh-credential}'
- git-url: '$GIT_URL/$PROJECT'
- refspec: '$GERRIT_REFSPEC'
- branch: '$GERRIT_BRANCH'
- submodule-recursive: '{submodule-recursive}'
- submodule-disable: '{submodule-disable}'
- submodule-timeout: '{submodule-timeout}'
+ jenkins-ssh-credential: "{jenkins-ssh-credential}"
+ git-url: "$GIT_URL/$PROJECT"
+ refspec: "$GERRIT_REFSPEC"
+ branch: "$GERRIT_BRANCH"
+ submodule-recursive: "{submodule-recursive}"
+ submodule-disable: "{submodule-disable}"
+ submodule-timeout: "{submodule-timeout}"
choosing-strategy: default
wrappers:
- lf-infra-wrappers:
- build-timeout: '{build-timeout}'
- jenkins-ssh-credential: '{jenkins-ssh-credential}'
+ build-timeout: "{build-timeout}"
+ jenkins-ssh-credential: "{jenkins-ssh-credential}"
publishers:
- lf-infra-publish
@@ -59,20 +59,20 @@
# Required Variables:
# script: build script to execute
#
- name: '{project-name}-{stream}-verify-c'
+ name: "{project-name}-{stream}-verify-c"
id: gerrit-verify-c
<<: *c_job_common
triggers:
- gerrit-trigger-patch-submitted:
- server: '{server-name}'
- project: '{project}'
- branch: '{branch}'
- files: '**'
+ server: "{server-name}"
+ project: "{project}"
+ branch: "{branch}"
+ files: "**"
builders:
- lf-infra-pre-build
- - shell: '{script}'
+ - shell: "{script}"
- job-template:
# Job template for building & pushing docker images
@@ -81,23 +81,23 @@
# 1. login to the docker registry
# 2. run a specified shell builder
#
- name: '{project-name}-{stream}-docker-c-shell-daily'
+ name: "{project-name}-{stream}-docker-c-shell-daily"
id: gerrit-docker-c-shell-daily
<<: *c_job_common
- node: 'ubuntu1804-docker-8c-8g'
+ node: "ubuntu1804-docker-8c-8g"
triggers:
# 12 AM UTC
- - timed: '@daily'
+ - timed: "@daily"
- gerrit-trigger-release-manually:
- server: '{server-name}'
- project: '{project}'
- branch: '{branch}'
+ server: "{server-name}"
+ project: "{project}"
+ branch: "{branch}"
builders:
- lf-infra-pre-build
- provide-maven-settings:
- global-settings-file: 'global-settings'
- settings-file: '{mvn-settings}'
+ global-settings-file: "global-settings"
+ settings-file: "{mvn-settings}"
- docker-login
- - shell: '{script}'
+ - shell: "{script}"
diff --git a/jjb/global-templates-docker.yaml b/jjb/global-templates-docker.yaml
index 23a554b..a584674 100644
--- a/jjb/global-templates-docker.yaml
+++ b/jjb/global-templates-docker.yaml
@@ -2,11 +2,11 @@
###########
# ANCHORS #
###########
-- docker_job_boiler_plate: &docker_job_boiler_plate
+- _docker_job_boiler_plate: &docker_job_boiler_plate
name: docker_job_boiler_plate
project-type: freestyle
- node: '{build-node}'
+ node: "{build-node}"
######################
# Default parameters #
@@ -16,14 +16,14 @@
submodule-recursive: true
# default params for docker jobs
- pre_build_script: ''
- post_build_script: ''
- docker_root: '$WORKSPACE'
- docker_build_args: ''
- docker_name: 'unnamed'
+ pre_build_script: ""
+ post_build_script: ""
+ docker_root: "$WORKSPACE"
+ docker_build_args: ""
+ docker_name: "unnamed"
# Default to LF standard 'snapshots' docker registry
- docker_registry: '$DOCKER_REGISTRY:10003'
- docker_tag: 'latest'
+ docker_registry: "$DOCKER_REGISTRY:10003"
+ docker_tag: "latest"
submodule-disable: false
submodule-timeout: 10
@@ -33,65 +33,65 @@
properties:
- lf-infra-properties:
- build-days-to-keep: '{build-days-to-keep}'
+ build-days-to-keep: "{build-days-to-keep}"
parameters:
- lf-infra-parameters:
- branch: '{branch}'
- project: '{project}'
- stream: '{stream}'
- lftools-version: '{lftools-version}'
+ branch: "{branch}"
+ project: "{project}"
+ stream: "{stream}"
+ lftools-version: "{lftools-version}"
wrappers:
- lf-infra-wrappers:
- build-timeout: '{build-timeout}'
- jenkins-ssh-credential: '{jenkins-ssh-credential}'
+ build-timeout: "{build-timeout}"
+ jenkins-ssh-credential: "{jenkins-ssh-credential}"
publishers:
- lf-infra-publish
-- docker_verify_boiler_plate: &docker_verify_boiler_plate
+- _docker_verify_boiler_plate: &docker_verify_boiler_plate
name: docker_verify_boiler_plate
concurrent: true
scm:
- gerrit-trigger-scm:
- refspec: '$GERRIT_REFSPEC'
- choosing-strategy: 'default'
- submodule-recursive: '{submodule-recursive}'
+ refspec: "$GERRIT_REFSPEC"
+ choosing-strategy: "default"
+ submodule-recursive: "{submodule-recursive}"
triggers:
- gerrit-trigger-patch-submitted:
- status-context: '{project}-Docker-Verify'
- server: '{server-name}'
- project: '{project}'
- branch: '{branch}'
- files: '{files}'
+ status-context: "{project}-Docker-Verify"
+ server: "{server-name}"
+ project: "{project}"
+ branch: "{branch}"
+ files: "{files}"
-- docker_merge_boiler_plate: &docker_merge_boiler_plate
+- _docker_merge_boiler_plate: &docker_merge_boiler_plate
name: docker_merge_boiler_plate
scm:
- gerrit-trigger-scm:
- refspec: '$GERRIT_REFSPEC'
- choosing-strategy: 'default'
- submodule-recursive: '{submodule-recursive}'
+ refspec: "$GERRIT_REFSPEC"
+ choosing-strategy: "default"
+ submodule-recursive: "{submodule-recursive}"
triggers:
- gerrit-trigger-patch-merged:
- server: '{server-name}'
- project: '{project}'
- branch: '{branch}'
- files: '{files}'
+ server: "{server-name}"
+ project: "{project}"
+ branch: "{branch}"
+ files: "{files}"
- pollscm:
- cron: ''
+ cron: ""
#################
# JOB TEMPLATES #
#################
- job-template:
- name: '{project-name}-{stream}-merge-docker'
+ name: "{project-name}-{stream}-merge-docker"
# Job template for Docker merge jobs
#
# The purpose of this job template is to run a docker build, and potentially
@@ -104,9 +104,9 @@
builders:
- lf-infra-pre-build
- lf-infra-docker-login:
- global-settings-file: 'global-settings'
- settings-file: '{mvn-settings}'
- - shell: '{pre_build_script}'
+ global-settings-file: "global-settings"
+ settings-file: "{mvn-settings}"
+ - shell: "{pre_build_script}"
- inject:
# Docker registry is purposely not using an '_' so as to not conflict
# with the Jenkins global env var
@@ -121,14 +121,14 @@
- shell: !include-raw: ../shell/docker-build.sh
- inject:
# Import the docker image information from the build step
- properties-file: 'env_inject.txt'
+ properties-file: "env_inject.txt"
# Execute any post build clean-up or testing
- - shell: '{post_build_script}'
+ - shell: "{post_build_script}"
# Provided all steps have already passed, push the docker image
- shell: !include-raw: ../shell/docker-push.sh
- job-template:
- name: '{project-name}-{stream}-verify-docker'
+ name: "{project-name}-{stream}-verify-docker"
# Job template for Docker verify jobs
#
# The purpose of this job template is to run a docker build, and potentially
@@ -145,9 +145,9 @@
builders:
- lf-infra-pre-build
- lf-infra-docker-login:
- global-settings-file: 'global-settings'
- settings-file: '{mvn-settings}'
- - shell: '{pre_build_script}'
+ global-settings-file: "global-settings"
+ settings-file: "{mvn-settings}"
+ - shell: "{pre_build_script}"
- inject:
# Docker registry is purposely not using an '_' so as to not conflict
# with the Jenkins global env var
@@ -162,9 +162,9 @@
- shell: !include-raw: ../shell/docker-build.sh
- inject:
# Import the docker image information from the build step
- properties-file: 'env_inject.txt'
+ properties-file: "env_inject.txt"
# Execute any post build clean-up or testing
- - shell: '{post_build_script}'
+ - shell: "{post_build_script}"
- job-template:
# Job template for creating a docker manifest list
@@ -173,38 +173,37 @@
# 1. docker_push_manifest.sh script (which needs to exist in the
# project implementation repo)
- name: '{project-name}-docker-manifest-{stream}'
+ name: "{project-name}-docker-manifest-{stream}"
<<: *docker_job_boiler_plate
- node: '{build-node}'
+ node: "{build-node}"
build-timeout: 15
parameters:
- lf-infra-parameters:
- project: '{project}'
- stream: '{stream}'
- branch: '{branch}'
+ project: "{project}"
+ stream: "{stream}"
+ branch: "{branch}"
- string:
name: PARENT_JOB_NAME
- default: 'none'
+ default: "none"
- disabled: '{obj:disabled}'
+ disabled: "{obj:disabled}"
scm:
- lf-infra-gerrit-scm:
- jenkins-ssh-credential: '{jenkins-ssh-credential}'
- git-url: '$GIT_URL/$PROJECT'
- refspec: '$GERRIT_REFSPEC'
- branch: '$GERRIT_BRANCH'
+ jenkins-ssh-credential: "{jenkins-ssh-credential}"
+ git-url: "$GIT_URL/$PROJECT"
+ refspec: "$GERRIT_REFSPEC"
+ branch: "$GERRIT_BRANCH"
submodule-recursive: true
- submodule-disable: '{submodule-disable}'
- submodule-timeout: '{submodule-timeout}'
+ submodule-disable: "{submodule-disable}"
+ submodule-timeout: "{submodule-timeout}"
choosing-strategy: default
-
builders:
- lf-infra-docker-login:
- global-settings-file: 'global-settings'
- settings-file: '{mvn-settings}'
+ global-settings-file: "global-settings"
+ settings-file: "{mvn-settings}"
- shell: |
#!/bin/bash -ex
export PARENT_JOB_NAME
@@ -218,84 +217,82 @@
# 2. Build and push a docker manifest list for the images created by
# the previous jobs
- name: '{project-name}-multiarch-docker-stage-{stream}'
- node: '{build-node}'
+ name: "{project-name}-multiarch-docker-stage-{stream}"
+ node: "{build-node}"
project-type: multijob
- disabled: '{obj:disabled}'
+ disabled: "{obj:disabled}"
build-timeout: 15
- pattern: '**'
+ pattern: "**"
parameters:
- lf-infra-parameters:
- project: '{project}'
- stream: '{stream}'
- branch: '{branch}'
+ project: "{project}"
+ stream: "{stream}"
+ branch: "{branch}"
- string:
name: DOCKER_REGISTRY
- default: 'none'
+ default: "none"
- string:
name: DOCKERHUB_REGISTRY
- default: 'registry-1.docker.io'
-
- disabled: '{obj:disabled}'
+ default: "registry-1.docker.io"
properties:
- throttle:
max-per-node: 1
- option: 'project'
+ option: "project"
- build-blocker:
use-build-blocker: true
blocking-jobs:
- - '{project-name}-.*-docker-.*'
- blocking-level: 'NODE'
+ - "{project-name}-.*-docker-.*"
+ blocking-level: "NODE"
scm:
- lf-infra-gerrit-scm:
- jenkins-ssh-credential: '{jenkins-ssh-credential}'
- git-url: '$GIT_URL/$PROJECT'
- refspec: '$GERRIT_REFSPEC'
- branch: '$GERRIT_BRANCH'
+ jenkins-ssh-credential: "{jenkins-ssh-credential}"
+ git-url: "$GIT_URL/$PROJECT"
+ refspec: "$GERRIT_REFSPEC"
+ branch: "$GERRIT_BRANCH"
submodule-recursive: true
submodule-timeout: 10
submodule-disable: false
choosing-strategy: default
triggers:
- - timed: '@daily'
+ - timed: "@daily"
- gerrit:
- server-name: '{gerrit-server-name}'
+ server-name: "{gerrit-server-name}"
trigger-on:
- - comment-added-contains-event:
- comment-contains-value: '^Patch Set\s+\d+:\s+stage-(docker-)?release\s*$'
+ - comment-added-contains-event:
+ comment-contains-value: '^Patch Set\s+\d+:\s+stage-(docker-)?release\s*$'
projects:
- project-compare-type: ANT
- project-pattern: '{project}'
+ project-pattern: "{project}"
branches:
- branch-compare-type: ANT
- branch-pattern: '**/{branch}'
+ branch-pattern: "**/{branch}"
file-paths:
- - compare-type: ANT
- pattern: "**"
+ - compare-type: ANT
+ pattern: "**"
builders:
- multijob:
- name: 'build docker images'
+ name: "build docker images"
condition: ALWAYS
execution-type: PARALLEL
projects:
- - name: '{project-name}-amd64-maven-docker-stage-{stream}'
+ - name: "{project-name}-amd64-maven-docker-stage-{stream}"
kill-phase-on: FAILURE
current-parameters: true
- - name: '{project-name}-arm64-maven-docker-stage-{stream}'
+ - name: "{project-name}-arm64-maven-docker-stage-{stream}"
kill-phase-on: NEVER
current-parameters: true
- multijob:
- name: 'publish docker manifest'
+ name: "publish docker manifest"
condition: SUCCESSFUL
execution-type: PARALLEL
projects:
- - name: '{project-name}-docker-manifest-{stream}'
+ - name: "{project-name}-docker-manifest-{stream}"
current-parameters: true
predefined-parameters: |
PARENT_JOB_NAME=$JOB_NAME
diff --git a/jjb/global-templates-golang.yaml b/jjb/global-templates-golang.yaml
index 72004dc..9643503 100644
--- a/jjb/global-templates-golang.yaml
+++ b/jjb/global-templates-golang.yaml
@@ -17,55 +17,55 @@
# pattern: ant file-path pattern relative to the workspace used to
# trigger the job
- name: '{project-name}-{stream}-verify-golang'
- path: '$WORKSPACE'
- pattern: '**'
- script: ''
- golangver: 'golang110'
+ name: "{project-name}-{stream}-verify-golang"
+ path: "$WORKSPACE"
+ pattern: "**"
+ script: ""
+ golangver: "golang110"
project-type: freestyle
concurrent: true
- node: '{build-node}'
+ node: "{build-node}"
properties:
- infra-properties:
- build-days-to-keep: '{build-days-to-keep}'
+ build-days-to-keep: "{build-days-to-keep}"
parameters:
- infra-parameters:
- project: '{project}'
- branch: '{branch}'
- refspec: 'refs/heads/{branch}'
- artifacts: '{archive-artifacts}'
+ project: "{project}"
+ branch: "{branch}"
+ refspec: "refs/heads/{branch}"
+ artifacts: "{archive-artifacts}"
scm:
- gerrit-trigger-scm:
- refspec: '$GERRIT_REFSPEC'
- choosing-strategy: 'gerrit'
- submodule-recursive: '{submodule-recursive}'
+ refspec: "$GERRIT_REFSPEC"
+ choosing-strategy: "gerrit"
+ submodule-recursive: "{submodule-recursive}"
wrappers:
- - '{golangver}'
+ - "{golangver}"
- infra-wrappers:
- build-timeout: '{build-timeout}'
+ build-timeout: "{build-timeout}"
triggers:
- gerrit-trigger-patch-submitted:
- server: '{server-name}'
- project: '{project}'
- branch: '{branch}'
- files: '{pattern}'
+ server: "{server-name}"
+ project: "{project}"
+ branch: "{branch}"
+ files: "{pattern}"
builders:
- lf-infra-pre-build
- provide-maven-settings:
- global-settings-file: 'global-settings'
- settings-file: '{mvn-settings}'
+ global-settings-file: "global-settings"
+ settings-file: "{mvn-settings}"
- shell: |
#!/bin/bash
cd $WORKSPACE/{path}
make build
- - shell: '{script}'
+ - shell: "{script}"
publishers:
- lf-infra-publish
@@ -74,7 +74,7 @@
# Job template for Golang verify jobs with subproject support
<<: *verify_golang_bolierplate
- name: '{project-name}-{stream}-{subproject}-verify-golang'
+ name: "{project-name}-{stream}-{subproject}-verify-golang"
- job-template:
# Job template for Golang merge jobs
@@ -89,49 +89,49 @@
# Required Variables:
# branch: git branch (eg. stable/lithium or master)
- name: '{project-name}-{stream}-merge-golang'
+ name: "{project-name}-{stream}-merge-golang"
path: $WORKSPACE
- golangver: 'golang110'
+ golangver: "golang110"
project-type: freestyle
- node: '{build-node}'
+ node: "{build-node}"
properties:
- infra-properties:
- build-days-to-keep: '{build-days-to-keep}'
+ build-days-to-keep: "{build-days-to-keep}"
parameters:
- infra-parameters:
- project: '{project}'
- branch: '{branch}'
- refspec: 'refs/heads/{branch}'
- artifacts: '{archive-artifacts}'
+ project: "{project}"
+ branch: "{branch}"
+ refspec: "refs/heads/{branch}"
+ artifacts: "{archive-artifacts}"
- maven-exec:
- maven-version: '{maven-version}'
+ maven-version: "{maven-version}"
scm:
- gerrit-trigger-scm:
- refspec: ''
- choosing-strategy: 'default'
- submodule-recursive: '{submodule-recursive}'
+ refspec: ""
+ choosing-strategy: "default"
+ submodule-recursive: "{submodule-recursive}"
wrappers:
- - '{golangver}'
+ - "{golangver}"
- infra-wrappers:
- build-timeout: '{build-timeout}'
+ build-timeout: "{build-timeout}"
triggers:
- gerrit-trigger-patch-merged:
- server: '{server-name}'
- project: '{project}'
- branch: '{branch}'
- files: '**'
+ server: "{server-name}"
+ project: "{project}"
+ branch: "{branch}"
+ files: "**"
builders:
- lf-infra-pre-build
- provide-maven-settings:
- global-settings-file: 'global-settings'
- settings-file: '{mvn-settings}'
+ global-settings-file: "global-settings"
+ settings-file: "{mvn-settings}"
- shell: |
#!/bin/bash
cd $WORKSPACE/{path}
@@ -152,49 +152,49 @@
# 2. run a specified shell builder
#
- name: '{project-name}-{stream}-docker-golang-shell-daily'
- golangver: 'golang110'
+ name: "{project-name}-{stream}-docker-golang-shell-daily"
+ golangver: "golang110"
project-type: freestyle
- node: 'ubuntu1804-docker-8c-8g'
+ node: "ubuntu1804-docker-8c-8g"
disabled: false
properties:
- infra-properties:
- build-days-to-keep: '{build-days-to-keep}'
+ build-days-to-keep: "{build-days-to-keep}"
parameters:
- infra-parameters:
- project: '{project}'
- branch: '{branch}'
- refspec: 'refs/heads/{branch}'
- artifacts: '{archive-artifacts}'
+ project: "{project}"
+ branch: "{branch}"
+ refspec: "refs/heads/{branch}"
+ artifacts: "{archive-artifacts}"
scm:
- gerrit-trigger-scm:
- refspec: ''
- choosing-strategy: 'default'
- submodule-recursive: '{submodule-recursive}'
+ refspec: ""
+ choosing-strategy: "default"
+ submodule-recursive: "{submodule-recursive}"
wrappers:
- - '{golangver}'
+ - "{golangver}"
- infra-wrappers:
- build-timeout: '{build-timeout}'
+ build-timeout: "{build-timeout}"
triggers:
# 12 AM UTC
- - timed: '@daily'
+ - timed: "@daily"
- gerrit-trigger-release-manually:
- server: '{server-name}'
- project: '{project}'
- branch: '{branch}'
+ server: "{server-name}"
+ project: "{project}"
+ branch: "{branch}"
builders:
- lf-infra-pre-build
- provide-maven-settings:
- global-settings-file: 'global-settings'
- settings-file: '{mvn-settings}'
+ global-settings-file: "global-settings"
+ settings-file: "{mvn-settings}"
- docker-login
- - shell: '{script}'
+ - shell: "{script}"
publishers:
- lf-infra-publish
diff --git a/jjb/global-templates-helm.yaml b/jjb/global-templates-helm.yaml
index 475efa0..ccf19b5 100644
--- a/jjb/global-templates-helm.yaml
+++ b/jjb/global-templates-helm.yaml
@@ -8,28 +8,30 @@
builders:
- inject:
properties-content: "SERVER_ID={server-id}"
- - shell: !include-raw-escape: ../shell/oom-create-netrc.sh
+ - shell: !include-raw-escape: ../shell/helm/oom-create-netrc.sh
+
+- builder:
+ name: helm-install
+ builders:
+ - inject:
+ properties-content: "HELM_VER={helm_ver}"
+ - shell: !include-raw-escape: ../shell/helm/helm-install.sh
###########
# ANCHORS #
###########
-- helm_job_boiler_plate: &helm_job_boiler_plate
+- _helm_job_boiler_plate: &helm_job_boiler_plate
name: helm_job_boiler_plate
######################
# Default parameters #
######################
-
branch: master
- submodule-recursive: true
-
# default params for helm jobs
- build_script: ''
- git-url: '$GIT_URL/$PROJECT'
- post_build_script: ''
- pre_build_script: ''
- submodule-disable: false
- submodule-timeout: 10
+ build_script: ""
+ git-url: "$GIT_URL/$PROJECT"
+ post_build_script: ""
+ pre_build_script: ""
build-timeout: 240
#####################
@@ -37,23 +39,41 @@
#####################
project-type: freestyle
- node: '{build-node}'
+ node: "{build-node}"
properties:
- lf-infra-properties:
- build-days-to-keep: '{build-days-to-keep}'
+ build-days-to-keep: "{build-days-to-keep}"
parameters:
- lf-infra-parameters:
- branch: '{branch}'
- project: '{project}'
- stream: '{stream}'
- lftools-version: '{lftools-version}'
+ branch: "{branch}"
+ project: "{project}"
+ stream: "{stream}"
+ lftools-version: "{lftools-version}"
+ - string:
+ name: HELM_BIN
+ default: "{helm_bin|helm3.8}"
+ - string:
+ name: BUILD_TYPE
+ default: "{build_type|snapshot}"
wrappers:
- lf-infra-wrappers:
- build-timeout: '{build-timeout}'
- jenkins-ssh-credential: '{jenkins-ssh-credential}'
+ build-timeout: "{build-timeout}"
+ jenkins-ssh-credential: "{jenkins-ssh-credential}"
+
+ builders:
+ - lf-infra-pre-build
+ - lf-provide-maven-settings:
+ global-settings-file: "{mvn-global-settings}"
+ settings-file: "{mvn-settings}"
+ - shell: "{obj:pre_build_script}"
+ - shell: "{obj:build_script}"
+ - oom-create-netrc:
+ server-id: oom-helm
+ - shell: "{obj:post_build_script}"
+ - lf-provide-maven-settings-cleanup
publishers:
- lf-infra-publish
@@ -62,7 +82,7 @@
# JOB TEMPLATES #
#################
- job-template:
- name: '{project-name}-{stream}-verify-{helm_bin}'
+ name: "{project-name}-{stream}-verify-{helm_bin}"
# Job template for helm verify jobs
<<: *helm_job_boiler_plate
@@ -70,264 +90,94 @@
scm:
- gerrit-trigger-scm:
- refspec: '$GERRIT_REFSPEC'
- choosing-strategy: 'gerrit'
- submodule-recursive: '{submodule-recursive}'
+ refspec: "$GERRIT_REFSPEC"
+ choosing-strategy: "gerrit"
+ submodule-recursive: "{submodule-recursive}"
triggers:
- gerrit-trigger-helm-patch-submitted:
- status-context: '{project}-Helm-Verify'
- server: '{server-name}'
- project: '{project}'
- branch: '{branch}'
- helm_bin: '{helm_bin}'
- files: '{files}'
-
- builders:
- - lf-infra-pre-build
- - shell: |
- echo "export HELM_BIN={helm_bin}" > helm.prop
- - shell: '{obj:pre_build_script}'
- - shell: '{obj:build_script}'
+ server: "{server-name}"
+ project: "{project}"
+ branch: "{branch}"
+ files: "{files}"
- job-template:
- name: '{project-name}-{stream}-merge-helm'
+ name: "{project-name}-{stream}-merge-helm"
# Job template for Helm merge jobs
<<: *helm_job_boiler_plate
scm:
- gerrit-trigger-scm:
- refspec: ''
- choosing-strategy: 'default'
- submodule-recursive: '{submodule-recursive}'
+ refspec: ""
+ choosing-strategy: "default"
+ submodule-recursive: "{submodule-recursive}"
triggers:
- gerrit-trigger-helm-patch-merged:
- server: '{server-name}'
- project: '{project}'
- branch: '{branch}'
- files: '{files}'
-
- builders:
- - lf-infra-pre-build
- - lf-provide-maven-settings:
- global-settings-file: '{mvn-global-settings}'
- settings-file: '{mvn-settings}'
- - shell: |
- echo "export HELM_BIN=helm3.6" > helm.prop
- - shell: '{obj:pre_build_script}'
- - shell: '{obj:build_script}'
- - oom-create-netrc:
- server-id: oom-helm
- - inject:
- properties-content: |
- BUILD_TYPE=snapshot
- - shell: '{obj:post_build_script}'
- - lf-provide-maven-settings-cleanup
+ server: "{server-name}"
+ project: "{project}"
+ branch: "{branch}"
+ files: "{files}"
- job-template:
- name: '{project-name}-{stream}-verify-external-helm'
- # Job template for helm verify jobs
-
- <<: *helm_job_boiler_plate
-
- parameters:
- - lf-infra-parameters:
- branch: '{branch}'
- project: 'oom'
- stream: '{stream}'
- lftools-version: '{lftools-version}'
-
- scm:
- - lf-infra-gerrit-scm:
- jenkins-ssh-credential: '{jenkins-ssh-credential}'
- git-url: '{git-url}'
- refspec: '$GERRIT_BRANCH'
- branch: '$GERRIT_BRANCH'
- submodule-recursive: '{submodule-recursive}'
- submodule-timeout: '{submodule-timeout}'
- submodule-disable: '{submodule-disable}'
- choosing-strategy: default
-
- triggers:
- - gerrit-trigger-helm-patch-submitted:
- status-context: '{project}-Helm-Verify'
- server: '{server-name}'
- project: '{project}'
- branch: '{branch}'
- files: '{files}'
-
- builders:
- - lf-infra-pre-build
- - inject:
- properties-content: 'HELM_MODULE={helm-module}'
- - shell: !include-raw-escape: shell/apply-submodule-patch-oom.sh
- - shell: |
- echo "export HELM_BIN=helm3.6" > helm.prop
- - shell: '{obj:pre_build_script}'
- - shell: '{obj:build_script}'
-
-- job-template:
- name: '{project-name}-{stream}-merge-external-helm'
- # Job template for Helm merge jobs
-
- <<: *helm_job_boiler_plate
-
- parameters:
- - lf-infra-parameters:
- branch: '{branch}'
- project: 'oom'
- stream: '{stream}'
- lftools-version: '{lftools-version}'
-
- scm:
- - lf-infra-gerrit-scm:
- jenkins-ssh-credential: '{jenkins-ssh-credential}'
- git-url: '{git-url}'
- refspec: '$GERRIT_BRANCH'
- branch: '$GERRIT_BRANCH'
- submodule-recursive: '{submodule-recursive}'
- submodule-timeout: '{submodule-timeout}'
- submodule-disable: '{submodule-disable}'
- choosing-strategy: default
-
- triggers:
- - gerrit-trigger-helm-patch-merged:
- server: '{server-name}'
- project: '{project}'
- branch: '{branch}'
- files: '{files}'
-
- builders:
- - lf-infra-pre-build
- - inject:
- properties-content: 'HELM_MODULE={helm-module}'
- - lf-provide-maven-settings:
- global-settings-file: 'global-settings'
- settings-file: '{mvn-settings}'
- - shell: |
- echo "export HELM_BIN=helm3.6" > helm.prop
- - shell: '{obj:pre_build_script}'
- - shell: '{obj:build_script}'
- - oom-create-netrc:
- server-id: oom-helm
- - inject:
- properties-content: |
- BUILD_TYPE=snapshot
- - shell: '{obj:post_build_script}'
- - lf-provide-maven-settings-cleanup
-
-- job-template:
- name: '{project-name}-{stream}-release-helm'
+ name: "{project-name}-{stream}-release-helm"
# Job template for Helm stage jobs
<<: *helm_job_boiler_plate
scm:
- gerrit-trigger-scm:
- refspec: ''
- choosing-strategy: 'default'
- submodule-recursive: '{submodule-recursive}'
+ refspec: ""
+ choosing-strategy: "default"
+ submodule-recursive: "{submodule-recursive}"
triggers:
- gerrit:
- server-name: '{gerrit-server-name}'
+ server-name: "{gerrit-server-name}"
trigger-on:
- comment-added-contains-event:
comment-contains-value: '^Patch Set\s+\d+:\s+release-helm\s*$'
projects:
- - project-compare-type: 'ANT'
- project-pattern: '{project}'
+ - project-compare-type: "ANT"
+ project-pattern: "{project}"
branches:
- - branch-compare-type: 'ANT'
- branch-pattern: '**/{branch}'
+ - branch-compare-type: "ANT"
+ branch-pattern: "**/{branch}"
file-paths:
- - compare-type: 'ANT'
- pattern: '**'
-
- builders:
- - lf-infra-pre-build
- - lf-provide-maven-settings:
- global-settings-file: '{mvn-global-settings}'
- settings-file: '{mvn-settings}'
- - shell: |
- echo "export HELM_BIN=helm3.6" > helm.prop
- - shell: '{obj:pre_build_script}'
- - shell: '{obj:build_script}'
- - oom-create-netrc:
- server-id: oom-helm
- - inject:
- properties-content: |
- BUILD_TYPE=release
- - shell: '{obj:post_build_script}'
- - lf-provide-maven-settings-cleanup
+ - compare-type: "ANT"
+ pattern: "**"
- job-template:
- name: '{project-name}-{subproject}-{stream}-verify-helm'
- # Job template for helm verify jobs
+ name: "{project-name}-{stream}-verify-make-{helm_bin}"
<<: *helm_job_boiler_plate
- disabled: true
- builders:
- - lf-infra-pre-build
- - shell: |
- echo "export HELM_BIN=helm3.6" > helm.prop
- - shell: '{pre_build_script}'
- - shell: '{build_script}'
- - shell: '{post_build_script}'
-
-- job-template:
- name: '{project-name}-{subproject}-{stream}-merge-helm'
- # Job template for helm merge jobs
-
- <<: *helm_job_boiler_plate
-
- disabled: true
- builders:
- - lf-infra-pre-build
- - shell: |
- echo "export HELM_BIN=helm3.6" > helm.prop
- - shell: '{pre_build_script}'
- - shell: '{build_script}'
- - inject:
- properties-content: |
- BUILD_TYPE=snapshot
- - shell: '{post_build_script}'
-
-- job-template:
- name: '{project-name}-{stream}-update-helm-weekly'
- # Job template for weekly helm update jobs
- #
- # Required Variables:
- # branch: git branch (eg. stable/lithium or master)
- <<: *helm_job_boiler_plate
-
- disabled: true
scm:
- - lf-infra-gerrit-scm:
- jenkins-ssh-credential: '{jenkins-ssh-credential}'
- git-url: '$GIT_URL/$PROJECT'
- refspec: '$GERRIT_REFSPEC'
- branch: '$GERRIT_BRANCH'
- submodule-recursive: true
- submodule-timeout: '{submodule-timeout}'
- submodule-disable: '{submodule-disable}'
- choosing-strategy: default
-
- builders:
- - lf-infra-pre-build
- - shell: |
- echo "export HELM_BIN=helm3.6" > helm.prop
- - shell: '{pre_build_script}'
- - shell: '{build_script}'
- - shell: '{post_build_script}'
+ - gerrit-trigger-scm:
+ refspec: ""
+ choosing-strategy: "default"
+ submodule-recursive: "{submodule-recursive}"
triggers:
- # 11 AM UTC
- - timed: '@daily'
- - gerrit-trigger-release-manually:
- server: '{server-name}'
- project: '{project}'
- branch: '{branch}'
+ - gerrit:
+ server-name: "{gerrit-server-name}"
+ trigger-on:
+ - comment-added-contains-event:
+ comment-contains-value: '^Patch Set\s+\d+:\s+helm-latest\s*$'
+ projects:
+ - project-compare-type: "ANT"
+ project-pattern: "{project}"
+ branches:
+ - branch-compare-type: "ANT"
+ branch-pattern: "**/{branch}"
+ file-paths:
+ - compare-type: "ANT"
+ pattern: "**"
+
+ builders:
+ - lf-infra-pre-build
+ - helm-install:
+ helm_ver: 3.10.2
+ - shell: "{obj:pre_build_script}"
+ - shell: "{obj:build_script}"
diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml
index ff021db..155a46a 100644
--- a/jjb/global-templates-java.yaml
+++ b/jjb/global-templates-java.yaml
@@ -8,70 +8,72 @@
# Required Variables:
# branch: git branch (eg. stable/lithium or master)
- name: '{project-name}-{stream}-verify-java'
+ name: "{project-name}-{stream}-verify-java"
project-type: freestyle
concurrent: true
- node: '{build-node}'
- build-env-variables: ''
- pattern: '**'
+ node: "{build-node}"
+ build-env-variables: ""
+ pattern: "**"
pom:
- mvn-opts: ''
- java-opts: ''
+ mvn-opts: ""
+ java-opts: ""
java-version: openjdk8
properties:
- infra-properties:
- build-days-to-keep: '{build-days-to-keep}'
+ build-days-to-keep: "{build-days-to-keep}"
parameters:
- infra-parameters:
- project: '{project}'
- branch: '{branch}'
- refspec: 'refs/heads/{branch}'
- artifacts: '{archive-artifacts}'
+ project: "{project}"
+ branch: "{branch}"
+ refspec: "refs/heads/{branch}"
+ artifacts: "{archive-artifacts}"
- maven-exec:
- maven-version: '{maven-version}'
+ maven-version: "{maven-version}"
- maven-params:
- mvn-params: '{mvn-params}'
+ mvn-params: "{mvn-params}"
scm:
- gerrit-trigger-scm:
- refspec: '$GERRIT_REFSPEC'
- choosing-strategy: 'gerrit'
- submodule-recursive: '{submodule-recursive}'
+ refspec: "$GERRIT_REFSPEC"
+ choosing-strategy: "gerrit"
+ submodule-recursive: "{submodule-recursive}"
wrappers:
- infra-wrappers:
- build-timeout: '{build-timeout}'
+ build-timeout: "{build-timeout}"
triggers:
- gerrit-trigger-patch-submitted:
- server: '{server-name}'
- project: '{project}'
- branch: '{branch}'
- files: '{obj:pattern}'
+ server: "{server-name}"
+ project: "{project}"
+ branch: "{branch}"
+ files: "{obj:pattern}"
builders:
- lf-infra-pre-build
- lf-update-java-alternatives:
java-version: "{java-version}"
- provide-maven-settings:
- global-settings-file: 'global-settings'
- settings-file: '{mvn-settings}'
+ global-settings-file: "global-settings"
+ settings-file: "{mvn-settings}"
- inject:
properties-content: "{build-env-variables}"
- maven-target:
- maven-version: '{maven-version}'
- pom: '{obj:pom}'
- goals: 'clean install -B
- -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn {mvn-params}'
+ maven-version: "{maven-version}"
+ pom: "{obj:pom}"
+ # yamllint disable rule:line-length
+ goals: "clean install -B
+ -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn {mvn-params}"
+ # yamlline enable
properties:
- MAVEN_OPTS='{mvn-opts}'
java-opts:
- "{java-opts}"
- settings: '{mvn-settings}'
+ settings: "{mvn-settings}"
settings-type: cfp
- global-settings: 'global-settings'
+ global-settings: "global-settings"
global-settings-type: cfp
publishers:
@@ -91,7 +93,7 @@
# branch: git branch (eg. stable/lithium or master)
<<: *verify_java_defaults
- name: '{project-name}-{stream}-verify-java-checkstyle'
+ name: "{project-name}-{stream}-verify-java-checkstyle"
publishers:
- lf-infra-publish
@@ -112,7 +114,7 @@
# trigger the job
<<: *verify_java_defaults
- name: '{project-name}-{stream}-{subproject}-verify-java'
+ name: "{project-name}-{stream}-{subproject}-verify-java"
- job-template:
# Job template for Java integration pairwise jobs
@@ -124,14 +126,14 @@
# branch: git branch (eg. stable/lithium or master)
<<: *verify_java_defaults
- name: '{project-name}-{stream}-integration-pairwise'
+ name: "{project-name}-{stream}-integration-pairwise"
triggers:
- - timed: '@daily'
+ - timed: "@daily"
- gerrit-trigger-patch-submitted:
- server: '{server-name}'
- project: '{project}'
- branch: '{branch}'
- files: '{obj:pattern}'
+ server: "{server-name}"
+ project: "{project}"
+ branch: "{branch}"
+ files: "{obj:pattern}"
- job-template:
# Job template for Java daily release jobs running checkstyle at the end
@@ -147,61 +149,61 @@
# Required Variables:
# branch: git branch (eg. stable/lithium or master)
- name: '{project-name}-{stream}-release-java-daily-checkstyle'
+ name: "{project-name}-{stream}-release-java-daily-checkstyle"
project-type: freestyle
- node: '{build-node}'
- disabled: '{disabled}'
+ node: "{build-node}"
+ disabled: false
maven-deploy-properties:
properties:
- infra-properties:
- build-days-to-keep: '{build-days-to-keep}'
+ build-days-to-keep: "{build-days-to-keep}"
parameters:
- infra-parameters:
- project: '{project}'
- branch: '{branch}'
- refspec: 'refs/heads/{branch}'
- artifacts: '{archive-artifacts}'
+ project: "{project}"
+ branch: "{branch}"
+ refspec: "refs/heads/{branch}"
+ artifacts: "{archive-artifacts}"
- maven-exec:
- maven-version: '{maven-version}'
+ maven-version: "{maven-version}"
scm:
- gerrit-trigger-scm:
- refspec: ''
- choosing-strategy: 'default'
- submodule-recursive: '{submodule-recursive}'
+ refspec: ""
+ choosing-strategy: "default"
+ submodule-recursive: "{submodule-recursive}"
wrappers:
- infra-wrappers:
- build-timeout: '{build-timeout}'
+ build-timeout: "{build-timeout}"
triggers:
# 11 AM UTC
- - timed: '@daily'
+ - timed: "@daily"
- gerrit-trigger-release-manually:
- server: '{server-name}'
- project: '{project}'
- branch: '{branch}'
+ server: "{server-name}"
+ project: "{project}"
+ branch: "{branch}"
builders:
- lf-infra-pre-build
- provide-maven-settings:
- global-settings-file: 'global-settings'
- settings-file: '{mvn-settings}'
+ global-settings-file: "global-settings"
+ settings-file: "{mvn-settings}"
- conditional-step:
condition-kind: regex-match
regex: DoSetVersion
- label: '{setVersion}'
+ label: "{setVersion}"
steps:
- inject:
properties-file: version.properties
- maven-set-release-version:
- maven-version: '{maven-version}'
- mvn-settings: '{mvn-settings}'
+ maven-version: "{maven-version}"
+ mvn-settings: "{mvn-settings}"
pom:
- maven-target:
- maven-version: '{maven-version}'
- goals: 'clean deploy -B
- -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
- properties: '{obj:mvn_properties}'
- settings: '{mvn-settings}'
+ maven-version: "{maven-version}"
+ goals: "clean deploy -B
+ -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn"
+ properties: "{obj:mvn_properties}"
+ settings: "{mvn-settings}"
settings-type: cfp
- global-settings: 'global-settings'
+ global-settings: "global-settings"
global-settings-type: cfp
publishers:
@@ -218,65 +220,65 @@
# Required Variables:
# branch: git branch (eg. stable/lithium or master)
- name: '{project-name}-{stream}-release-version-java-daily'
+ name: "{project-name}-{stream}-release-version-java-daily"
project-type: freestyle
- disabled: '{disabled}'
- node: '{build-node}'
+ disabled: false
+ node: "{build-node}"
maven-deploy-properties:
properties:
- infra-properties:
- build-days-to-keep: '{build-days-to-keep}'
+ build-days-to-keep: "{build-days-to-keep}"
parameters:
- infra-parameters:
- project: '{project}'
- branch: '{branch}'
- refspec: 'refs/heads/{branch}'
- artifacts: '{archive-artifacts}'
+ project: "{project}"
+ branch: "{branch}"
+ refspec: "refs/heads/{branch}"
+ artifacts: "{archive-artifacts}"
- maven-exec:
- maven-version: '{maven-version}'
+ maven-version: "{maven-version}"
scm:
- gerrit-trigger-scm:
- refspec: ''
- choosing-strategy: 'default'
- submodule-recursive: '{submodule-recursive}'
+ refspec: ""
+ choosing-strategy: "default"
+ submodule-recursive: "{submodule-recursive}"
wrappers:
- infra-wrappers:
- build-timeout: '{build-timeout}'
+ build-timeout: "{build-timeout}"
triggers:
# 11 AM UTC
- - timed: '@daily'
+ - timed: "@daily"
- gerrit-trigger-release-manually:
- server: '{server-name}'
- project: '{project}'
- branch: '{branch}'
+ server: "{server-name}"
+ project: "{project}"
+ branch: "{branch}"
builders:
- lf-infra-pre-build
- provide-maven-settings:
- global-settings-file: 'global-settings'
- settings-file: '{mvn-settings}'
+ global-settings-file: "global-settings"
+ settings-file: "{mvn-settings}"
- inject:
properties-file: version.properties
- maven-set-release-version:
- maven-version: '{maven-version}'
- mvn-settings: '{mvn-settings}'
+ maven-version: "{maven-version}"
+ mvn-settings: "{mvn-settings}"
pom:
- maven-target:
- maven-version: '{maven-version}'
- goals: 'clean deploy -B
- -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
+ maven-version: "{maven-version}"
+ goals: "clean deploy -B
+ -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn"
properties:
- - '{maven-deploy-properties}'
- settings: '{mvn-settings}'
+ - "{maven-deploy-properties}"
+ settings: "{mvn-settings}"
settings-type: cfp
- global-settings: 'global-settings'
+ global-settings: "global-settings"
global-settings-type: cfp
publishers:
@@ -291,76 +293,74 @@
# Required Variables:
# branch: git branch (eg. stable/lithium or master)
- name: '{project-name}-{stream}-merge-java'
+ name: "{project-name}-{stream}-merge-java"
project-type: freestyle
- node: '{build-node}'
- pattern: '**'
+ node: "{build-node}"
+ pattern: "**"
pom:
mvn_properties: []
- mvn-params: ''
- mvn-opts: ''
- java-opts: ''
+ mvn-params: ""
+ mvn-opts: ""
+ java-opts: ""
java-version: openjdk8
properties:
- infra-properties:
- build-days-to-keep: '{build-days-to-keep}'
+ build-days-to-keep: "{build-days-to-keep}"
parameters:
- infra-parameters:
- project: '{project}'
- branch: '{branch}'
- refspec: 'refs/heads/{branch}'
- artifacts: '{archive-artifacts}'
+ project: "{project}"
+ branch: "{branch}"
+ refspec: "refs/heads/{branch}"
+ artifacts: "{archive-artifacts}"
- maven-exec:
- maven-version: '{maven-version}'
+ maven-version: "{maven-version}"
scm:
- gerrit-trigger-scm:
- refspec: ''
- choosing-strategy: 'default'
- submodule-recursive: '{submodule-recursive}'
+ refspec: ""
+ choosing-strategy: "default"
+ submodule-recursive: "{submodule-recursive}"
wrappers:
- lf-infra-wrappers:
- build-timeout: '{build-timeout}'
- jenkins-ssh-credential: '{jenkins-ssh-credential}'
+ build-timeout: "{build-timeout}"
+ jenkins-ssh-credential: "{jenkins-ssh-credential}"
triggers:
- gerrit-trigger-patch-merged:
- server: '{server-name}'
- project: '{project}'
- branch: '{branch}'
- files: '{pattern}'
+ server: "{server-name}"
+ project: "{project}"
+ branch: "{branch}"
+ files: "{pattern}"
builders:
- lf-infra-pre-build
- lf-update-java-alternatives:
java-version: "{java-version}"
- provide-maven-settings:
- global-settings-file: 'global-settings'
- settings-file: '{mvn-settings}'
+ global-settings-file: "global-settings"
+ settings-file: "{mvn-settings}"
- conditional-step:
condition-kind: regex-match
regex: .*(amd64|arm64).*
- label: '{project-name}'
+ label: "{project-name}"
steps:
- shell: !include-raw-escape: global-jjb/shell/docker-login.sh
- maven-target:
- maven-version: '{maven-version}'
- pom: '{obj:pom}'
- goals: 'clean deploy -B {mvn-params}
- -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
- properties:
- - MAVEN_OPTS='{mvn-opts}'
+ maven-version: "{maven-version}"
+ pom: "{obj:pom}"
+ goals: "clean deploy -B {mvn-params}
+ -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn"
java-opts:
- "{java-opts}"
- settings: '{mvn-settings}'
+ settings: "{mvn-settings}"
settings-type: cfp
- global-settings: 'global-settings'
+ global-settings: "global-settings"
global-settings-type: cfp
- properties: '{obj:mvn_properties}'
+ properties: "{obj:mvn_properties}"
publishers:
- lf-infra-publish
@@ -378,12 +378,12 @@
# maven-properties: properties passed to maven
<<: *merge_java_defaults
- name: '{project-name}-{stream}-merge-properties-java'
+ name: "{project-name}-{stream}-merge-properties-java"
wrappers:
- lf-infra-wrappers:
- build-timeout: '{build-timeout}'
- jenkins-ssh-credential: '{jenkins-ssh-credential}'
+ build-timeout: "{build-timeout}"
+ jenkins-ssh-credential: "{jenkins-ssh-credential}"
- job-template:
# Job template for Java merge jobs that takes a maven template
@@ -395,23 +395,23 @@
# branch: git branch (eg. stable/lithium or master)
<<: *merge_java_defaults
- name: '{project-name}-{stream}-merge-profile-java'
+ name: "{project-name}-{stream}-merge-profile-java"
builders:
- lf-infra-pre-build
- provide-maven-settings:
- global-settings-file: 'global-settings'
- settings-file: '{mvn-settings}'
+ global-settings-file: "global-settings"
+ settings-file: "{mvn-settings}"
- docker-login
- maven-target:
- maven-version: '{maven-version}'
- goals: 'clean deploy -P {mvn-profile} -B
- -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
- settings: '{mvn-settings}'
+ maven-version: "{maven-version}"
+ goals: "clean deploy -P {mvn-profile} -B
+ -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn"
+ settings: "{mvn-settings}"
settings-type: cfp
- global-settings: 'global-settings'
+ global-settings: "global-settings"
global-settings-type: cfp
properties:
- docker.pull.registry=nexus3.onap.org:10001
@@ -432,7 +432,7 @@
# trigger the job
<<: *merge_java_defaults
- name: '{project-name}-{stream}-{subproject}-merge-java'
+ name: "{project-name}-{stream}-{subproject}-merge-java"
- job-template: &docker_java_defaults
# Job template for Docker daily jobs
@@ -444,44 +444,44 @@
# Required Variables:
# branch: git branch (eg. stable/lithium or master)
- name: '{project-name}-{stream}-docker-java-daily'
- id: '{project-name}-{stream}-docker-java-daily'
+ name: "{project-name}-{stream}-docker-java-daily"
+ id: "{project-name}-{stream}-docker-java-daily"
project-type: freestyle
- node: '{build-node}'
- disabled: '{disabled}'
+ node: "{build-node}"
+ disabled: false
java-version: openjdk8
properties:
- infra-properties:
- build-days-to-keep: '{build-days-to-keep}'
+ build-days-to-keep: "{build-days-to-keep}"
parameters:
- infra-parameters:
- project: '{project}'
- branch: '{branch}'
- refspec: 'refs/heads/{branch}'
- artifacts: '{archive-artifacts}'
+ project: "{project}"
+ branch: "{branch}"
+ refspec: "refs/heads/{branch}"
+ artifacts: "{archive-artifacts}"
- maven-exec:
- maven-version: '{maven-version}'
+ maven-version: "{maven-version}"
- maven-params:
- mvn-params: '{mvn-params}'
+ mvn-params: "{mvn-params}"
scm:
- gerrit-trigger-scm:
- refspec: ''
- choosing-strategy: 'default'
- submodule-recursive: '{submodule-recursive}'
+ refspec: ""
+ choosing-strategy: "default"
+ submodule-recursive: "{submodule-recursive}"
wrappers:
- infra-wrappers:
- build-timeout: '{build-timeout}'
+ build-timeout: "{build-timeout}"
triggers:
# 12 AM UTC
- - timed: '@daily'
+ - timed: "@daily"
- gerrit-trigger-release-manually:
- server: '{server-name}'
- project: '{project}'
- branch: '{branch}'
+ server: "{server-name}"
+ project: "{project}"
+ branch: "{branch}"
builders:
- lf-infra-pre-build
@@ -489,18 +489,18 @@
java-version: "{java-version}"
- provide-maven-settings:
- global-settings-file: 'global-settings'
- settings-file: '{mvn-settings}'
+ global-settings-file: "global-settings"
+ settings-file: "{mvn-settings}"
- docker-login
- maven-docker-push-daily:
- maven-version: '{maven-version}'
- mvn-settings: '{mvn-settings}'
- pom: '{docker-pom}'
+ maven-version: "{maven-version}"
+ mvn-settings: "{mvn-settings}"
+ pom: "{docker-pom}"
# use default as mvn-profile if profile is not needed
- mvn-profile: '{mvn-profile}'
- mvn-params: '{mvn-params}'
+ mvn-profile: "{mvn-profile}"
+ mvn-params: "{mvn-params}"
publishers:
- lf-infra-publish
@@ -516,12 +516,12 @@
# branch: git branch (eg. stable/lithium or master)
<<: *docker_java_defaults
- name: '{project-name}-{stream}-docker-java-daily'
+ name: "{project-name}-{stream}-docker-java-daily"
id: docker-java-daily
- node: '{build-node}'
+ node: "{build-node}"
wrappers:
- infra-wrappers-docker-build:
- build-timeout: '{build-timeout}'
+ build-timeout: "{build-timeout}"
- job-template:
# Job template for building & pushing docker images
@@ -534,58 +534,58 @@
# pom: name/location of the pom.xml file relative to the workspace
# maven-properties: properties passed to maven
- name: '{project-name}-{stream}-docker-java-shell-daily'
+ name: "{project-name}-{stream}-docker-java-shell-daily"
project-type: freestyle
- node: '{build-node}'
- disabled: '{disabled}'
+ node: "{build-node}"
+ disabled: false
properties:
- infra-properties:
- build-days-to-keep: '{build-days-to-keep}'
+ build-days-to-keep: "{build-days-to-keep}"
parameters:
- infra-parameters:
- project: '{project}'
- branch: '{branch}'
- refspec: 'refs/heads/{branch}'
- artifacts: '{archive-artifacts}'
+ project: "{project}"
+ branch: "{branch}"
+ refspec: "refs/heads/{branch}"
+ artifacts: "{archive-artifacts}"
- maven-exec:
- maven-version: '{maven-version}'
+ maven-version: "{maven-version}"
scm:
- gerrit-trigger-scm:
- refspec: ''
- choosing-strategy: 'default'
- submodule-recursive: '{submodule-recursive}'
+ refspec: ""
+ choosing-strategy: "default"
+ submodule-recursive: "{submodule-recursive}"
wrappers:
- infra-wrappers:
- build-timeout: '{build-timeout}'
+ build-timeout: "{build-timeout}"
triggers:
# 12 AM UTC
- - timed: '@daily'
+ - timed: "@daily"
- gerrit-trigger-release-manually:
- server: '{server-name}'
- project: '{project}'
- branch: '{branch}'
+ server: "{server-name}"
+ project: "{project}"
+ branch: "{branch}"
builders:
- lf-infra-pre-build
- provide-maven-settings:
- global-settings-file: 'global-settings'
- settings-file: '{mvn-settings}'
+ global-settings-file: "global-settings"
+ settings-file: "{mvn-settings}"
- docker-login
- maven-target:
- maven-version: '{maven-version}'
- goals: '{mvn-goals}'
- settings: '{mvn-settings}'
+ maven-version: "{maven-version}"
+ goals: "{mvn-goals}"
+ settings: "{mvn-settings}"
settings-type: cfp
- global-settings: 'global-settings'
+ global-settings: "global-settings"
global-settings-type: cfp
- - shell: '{script}'
+ - shell: "{script}"
publishers:
- lf-infra-publish
@@ -601,59 +601,59 @@
# pom: name/location of the pom.xml file relative to the workspace
# maven-properties: properties passed to maven
- name: '{project-name}-{stream}-{subproject}-docker-java-shell-daily'
+ name: "{project-name}-{stream}-{subproject}-docker-java-shell-daily"
project-type: freestyle
- node: '{build-node}'
- disabled: '{disabled}'
+ node: "{build-node}"
+ disabled: false
properties:
- infra-properties:
- build-days-to-keep: '{build-days-to-keep}'
+ build-days-to-keep: "{build-days-to-keep}"
parameters:
- infra-parameters:
- project: '{project}'
- branch: '{branch}'
- refspec: 'refs/heads/{branch}'
- artifacts: '{archive-artifacts}'
+ project: "{project}"
+ branch: "{branch}"
+ refspec: "refs/heads/{branch}"
+ artifacts: "{archive-artifacts}"
- maven-exec:
- maven-version: '{maven-version}'
+ maven-version: "{maven-version}"
scm:
- gerrit-trigger-scm:
- refspec: ''
- choosing-strategy: 'default'
- submodule-recursive: '{submodule-recursive}'
+ refspec: ""
+ choosing-strategy: "default"
+ submodule-recursive: "{submodule-recursive}"
wrappers:
- infra-wrappers:
- build-timeout: '{build-timeout}'
+ build-timeout: "{build-timeout}"
triggers:
# 12 AM UTC
- - timed: '@daily'
+ - timed: "@daily"
- gerrit-trigger-release-manually:
- server: '{server-name}'
- project: '{project}'
- branch: '{branch}'
+ server: "{server-name}"
+ project: "{project}"
+ branch: "{branch}"
builders:
- lf-infra-pre-build
- provide-maven-settings:
- global-settings-file: 'global-settings'
- settings-file: '{mvn-settings}'
+ global-settings-file: "global-settings"
+ settings-file: "{mvn-settings}"
- docker-login
- maven-target:
- maven-version: '{maven-version}'
- pom: '{pom}'
- goals: '{mvn-goals}'
- settings: '{mvn-settings}'
+ maven-version: "{maven-version}"
+ pom: "{pom}"
+ goals: "{mvn-goals}"
+ settings: "{mvn-settings}"
settings-type: cfp
- global-settings: 'global-settings'
+ global-settings: "global-settings"
global-settings-type: cfp
- - shell: '{script}'
+ - shell: "{script}"
publishers:
- lf-infra-publish
@@ -670,65 +670,65 @@
# pom: name/location of the pom.xml file relative to the workspace
# maven-properties: properties passed to maven
- name: '{project-name}-{stream}-docker-java-version-shell-daily'
+ name: "{project-name}-{stream}-docker-java-version-shell-daily"
project-type: freestyle
- node: '{build-node}'
- disabled: '{disabled}'
+ node: "{build-node}"
+ disabled: false
properties:
- infra-properties:
- build-days-to-keep: '{build-days-to-keep}'
+ build-days-to-keep: "{build-days-to-keep}"
parameters:
- infra-parameters:
- project: '{project}'
- branch: '{branch}'
- refspec: 'refs/heads/{branch}'
- artifacts: '{archive-artifacts}'
+ project: "{project}"
+ branch: "{branch}"
+ refspec: "refs/heads/{branch}"
+ artifacts: "{archive-artifacts}"
- maven-exec:
- maven-version: '{maven-version}'
+ maven-version: "{maven-version}"
scm:
- gerrit-trigger-scm:
- refspec: ''
- choosing-strategy: 'default'
- submodule-recursive: '{submodule-recursive}'
+ refspec: ""
+ choosing-strategy: "default"
+ submodule-recursive: "{submodule-recursive}"
wrappers:
- infra-wrappers:
- build-timeout: '{build-timeout}'
+ build-timeout: "{build-timeout}"
triggers:
# 12 AM UTC
- - timed: '@daily'
+ - timed: "@daily"
- gerrit-trigger-release-manually:
- server: '{server-name}'
- project: '{project}'
- branch: '{branch}'
+ server: "{server-name}"
+ project: "{project}"
+ branch: "{branch}"
builders:
- lf-infra-pre-build
- provide-maven-settings:
- global-settings-file: 'global-settings'
- settings-file: '{mvn-settings}'
+ global-settings-file: "global-settings"
+ settings-file: "{mvn-settings}"
- inject:
properties-file: version.properties
- maven-set-release-version:
- maven-version: '{maven-version}'
- mvn-settings: '{mvn-settings}'
+ maven-version: "{maven-version}"
+ mvn-settings: "{mvn-settings}"
pom:
- docker-login
- maven-target:
- maven-version: '{maven-version}'
- goals: '{mvn-goals}'
- settings: '{mvn-settings}'
+ maven-version: "{maven-version}"
+ goals: "{mvn-goals}"
+ settings: "{mvn-settings}"
settings-type: cfp
- global-settings: 'global-settings'
+ global-settings: "global-settings"
global-settings-type: cfp
- - shell: '{script}'
+ - shell: "{script}"
publishers:
- lf-infra-publish
@@ -747,66 +747,66 @@
# pom: name/location of the pom.xml file relative to the workspace
# maven-properties: properties passed to maven
- name: '{project-name}-{stream}-{subproject}-docker-java-version-shell-daily'
+ name: "{project-name}-{stream}-{subproject}-docker-java-version-shell-daily"
project-type: freestyle
- node: 'ubuntu1804-docker-8c-8g'
- disabled: '{disabled}'
+ node: "ubuntu1804-docker-8c-8g"
+ disabled: false
properties:
- infra-properties:
- build-days-to-keep: '{build-days-to-keep}'
+ build-days-to-keep: "{build-days-to-keep}"
parameters:
- infra-parameters:
- project: '{project}'
- branch: '{branch}'
- refspec: 'refs/heads/{branch}'
- artifacts: '{archive-artifacts}'
+ project: "{project}"
+ branch: "{branch}"
+ refspec: "refs/heads/{branch}"
+ artifacts: "{archive-artifacts}"
- maven-exec:
- maven-version: '{maven-version}'
+ maven-version: "{maven-version}"
scm:
- gerrit-trigger-scm:
- refspec: ''
- choosing-strategy: 'default'
- submodule-recursive: '{submodule-recursive}'
+ refspec: ""
+ choosing-strategy: "default"
+ submodule-recursive: "{submodule-recursive}"
wrappers:
- infra-wrappers:
- build-timeout: '{build-timeout}'
+ build-timeout: "{build-timeout}"
triggers:
# 12 AM UTC
- - timed: '@daily'
+ - timed: "@daily"
- gerrit-trigger-release-manually:
- server: '{server-name}'
- project: '{project}'
- branch: '{branch}'
+ server: "{server-name}"
+ project: "{project}"
+ branch: "{branch}"
builders:
- lf-infra-pre-build
- provide-maven-settings:
- global-settings-file: 'global-settings'
- settings-file: '{mvn-settings}'
+ global-settings-file: "global-settings"
+ settings-file: "{mvn-settings}"
- inject:
properties-file: version.properties
- maven-set-release-version:
- maven-version: '{maven-version}'
- mvn-settings: '{mvn-settings}'
- pom: '{pom}'
+ maven-version: "{maven-version}"
+ mvn-settings: "{mvn-settings}"
+ pom: "{pom}"
- docker-login
- maven-target:
- maven-version: '{maven-version}'
- pom: '{pom}'
- goals: '{mvn-goals}'
- settings: '{mvn-settings}'
+ maven-version: "{maven-version}"
+ pom: "{pom}"
+ goals: "{mvn-goals}"
+ settings: "{mvn-settings}"
settings-type: cfp
- global-settings: 'global-settings'
+ global-settings: "global-settings"
global-settings-type: cfp
- - shell: '{script}'
+ - shell: "{script}"
publishers:
- lf-infra-publish
@@ -824,66 +824,66 @@
# profile: the docker profile defined in the pom
# maven-properties: properties passed to maven
- name: '{project-name}-{stream}-docker-version-java-daily'
- id: '{project-name}-{stream}-docker-version-java-daily'
+ name: "{project-name}-{stream}-docker-version-java-daily"
+ id: "{project-name}-{stream}-docker-version-java-daily"
project-type: freestyle
- node: '{build-node}'
- disabled: '{disabled}'
+ node: "{build-node}"
+ disabled: false
properties:
- infra-properties:
- build-days-to-keep: '{build-days-to-keep}'
+ build-days-to-keep: "{build-days-to-keep}"
parameters:
- infra-parameters:
- project: '{project}'
- branch: '{branch}'
- refspec: 'refs/heads/{branch}'
- artifacts: '{archive-artifacts}'
+ project: "{project}"
+ branch: "{branch}"
+ refspec: "refs/heads/{branch}"
+ artifacts: "{archive-artifacts}"
- maven-exec:
- maven-version: '{maven-version}'
+ maven-version: "{maven-version}"
- maven-params:
- mvn-params: '{mvn-params}'
+ mvn-params: "{mvn-params}"
scm:
- gerrit-trigger-scm:
- refspec: ''
- choosing-strategy: 'default'
- submodule-recursive: '{submodule-recursive}'
+ refspec: ""
+ choosing-strategy: "default"
+ submodule-recursive: "{submodule-recursive}"
wrappers:
- infra-wrappers:
- build-timeout: '{build-timeout}'
+ build-timeout: "{build-timeout}"
triggers:
# 12 AM UTC
- - timed: '@daily'
+ - timed: "@daily"
- gerrit-trigger-release-manually:
- server: '{server-name}'
- project: '{project}'
- branch: '{branch}'
+ server: "{server-name}"
+ project: "{project}"
+ branch: "{branch}"
builders:
- lf-infra-pre-build
- provide-maven-settings:
- global-settings-file: 'global-settings'
- settings-file: '{mvn-settings}'
+ global-settings-file: "global-settings"
+ settings-file: "{mvn-settings}"
- inject:
properties-file: version.properties
- maven-set-release-version:
- maven-version: '{maven-version}'
- mvn-settings: '{mvn-settings}'
+ maven-version: "{maven-version}"
+ mvn-settings: "{mvn-settings}"
pom:
- docker-login
- maven-docker-push-daily:
- maven-version: '{maven-version}'
- mvn-settings: '{mvn-settings}'
- pom: '{docker-pom}'
+ maven-version: "{maven-version}"
+ mvn-settings: "{mvn-settings}"
+ pom: "{docker-pom}"
# use default as mvn-profile if profile is not needed
- mvn-profile: '{mvn-profile}'
- mvn-params: '{mvn-params}'
+ mvn-profile: "{mvn-profile}"
+ mvn-params: "{mvn-params}"
publishers:
- lf-infra-publish
@@ -902,12 +902,12 @@
# maven-properties: properties passed to maven
<<: *docker_version_java_defaults
- name: '{project-name}-{stream}-docker-version-java-daily'
- id: 'docker-version-java-daily'
- node: '{build-node}'
+ name: "{project-name}-{stream}-docker-version-java-daily"
+ id: "docker-version-java-daily"
+ node: "{build-node}"
wrappers:
- infra-wrappers-docker-build:
- build-timeout: '{build-timeout}'
+ build-timeout: "{build-timeout}"
- job-template:
# Job template for building & pushing docker images for AAI specific repos
@@ -921,72 +921,72 @@
# pom: name/location of the pom.xml file relative to the workspace
# maven-properties: properties passed to maven
- name: '{project-name}-{stream}-aai-docker-java-daily'
+ name: "{project-name}-{stream}-aai-docker-java-daily"
project-type: freestyle
- node: '{build-node}'
- docker-image-name: ''
- disabled: '{disabled}'
- java-version: 'openjdk8'
+ node: "{build-node}"
+ docker-image-name: ""
+ disabled: false
+ java-version: "openjdk8"
properties:
- infra-properties:
- build-days-to-keep: '{build-days-to-keep}'
+ build-days-to-keep: "{build-days-to-keep}"
parameters:
- infra-parameters:
- project: '{project}'
- branch: '{branch}'
- refspec: 'refs/heads/{branch}'
- artifacts: '{archive-artifacts}'
+ project: "{project}"
+ branch: "{branch}"
+ refspec: "refs/heads/{branch}"
+ artifacts: "{archive-artifacts}"
- maven-exec:
- maven-version: '{maven-version}'
+ maven-version: "{maven-version}"
- docker-image-name:
- docker-image-name: '{docker-image-name}'
+ docker-image-name: "{docker-image-name}"
scm:
- gerrit-trigger-scm:
- refspec: ''
- choosing-strategy: 'default'
- submodule-recursive: '{submodule-recursive}'
+ refspec: ""
+ choosing-strategy: "default"
+ submodule-recursive: "{submodule-recursive}"
wrappers:
- infra-wrappers:
- build-timeout: '{build-timeout}'
+ build-timeout: "{build-timeout}"
triggers:
# 12 AM UTC
- - timed: '@daily'
+ - timed: "@daily"
- gerrit-trigger-release-manually:
- server: '{server-name}'
- project: '{project}'
- branch: '{branch}'
+ server: "{server-name}"
+ project: "{project}"
+ branch: "{branch}"
builders:
- lf-infra-pre-build
- lf-update-java-alternatives:
java-version: "{java-version}"
- provide-maven-settings:
- global-settings-file: 'global-settings'
- settings-file: '{mvn-settings}'
+ global-settings-file: "global-settings"
+ settings-file: "{mvn-settings}"
- docker-login
- maven-target:
- maven-version: '{maven-version}'
- pom: 'pom.xml'
- goals: 'clean install -DskipTests -B
- -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
- settings: '{mvn-settings}'
+ maven-version: "{maven-version}"
+ pom: "pom.xml"
+ goals: "clean install -DskipTests -B
+ -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn"
+ settings: "{mvn-settings}"
settings-type: cfp
- global-settings: 'global-settings'
+ global-settings: "global-settings"
global-settings-type: cfp
- maven-target:
- maven-version: '{maven-version}'
- pom: '{pom}'
- goals: '{mvn-goals}'
- settings: '{mvn-settings}'
+ maven-version: "{maven-version}"
+ pom: "{pom}"
+ goals: "{mvn-goals}"
+ settings: "{mvn-settings}"
settings-type: cfp
- global-settings: 'global-settings'
+ global-settings: "global-settings"
global-settings-type: cfp
properties:
- maven.test.skip=true
@@ -1008,9 +1008,9 @@
# branch: git branch (eg. stable/lithium or master)
<<: *merge_java_defaults
- name: '{project-name}-{stream}-sdc-merge-java'
+ name: "{project-name}-{stream}-sdc-merge-java"
- node: '{build-node}'
+ node: "{build-node}"
build-timeout: 120
builders:
@@ -1018,18 +1018,18 @@
- lf-update-java-alternatives:
java-version: "{java-version}"
- provide-maven-settings:
- global-settings-file: 'global-settings'
- settings-file: '{mvn-settings}'
+ global-settings-file: "global-settings"
+ settings-file: "{mvn-settings}"
- docker-login
- maven-docker-push-daily:
- maven-version: '{maven-version}'
- mvn-settings: '{mvn-settings}'
- pom: '{docker-pom}'
+ maven-version: "{maven-version}"
+ mvn-settings: "{mvn-settings}"
+ pom: "{docker-pom}"
# use default as mvn-profile if profile is not needed
- mvn-profile: '{mvn-profile}'
- mvn-params: ''
+ mvn-profile: "{mvn-profile}"
+ mvn-params: ""
- job-template:
# Job template for Java merge jobs on multiple architectures
@@ -1039,69 +1039,69 @@
# 2. Build and push a docker manifest list for the images created by
# the previous jobs
- name: '{project-name}-multiarch-{stream}-merge-java'
- node: '{build-node}'
+ name: "{project-name}-multiarch-{stream}-merge-java"
+ node: "{build-node}"
project-type: multijob
- disabled: '{obj:disabled}'
- pattern: '**'
+ disabled: "{obj:disabled}"
+ pattern: "**"
parameters:
- lf-infra-parameters:
- project: '{project}'
- stream: '{stream}'
- branch: '{branch}'
+ project: "{project}"
+ stream: "{stream}"
+ branch: "{branch}"
- string:
name: DOCKER_REGISTRY
- default: 'none'
+ default: "none"
- string:
name: DOCKERHUB_REGISTRY
- default: 'registry-1.docker.io'
+ default: "registry-1.docker.io"
properties:
- throttle:
max-per-node: 1
- option: 'project'
+ option: "project"
- build-blocker:
use-build-blocker: true
blocking-jobs:
- - '{project-name}-.*-merge-.*'
- blocking-level: 'NODE'
+ - "{project-name}-.*-merge-.*"
+ blocking-level: "NODE"
scm:
- gerrit-trigger-scm:
- refspec: ''
- choosing-strategy: 'default'
- submodule-recursive: '{submodule-recursive}'
+ refspec: ""
+ choosing-strategy: "default"
+ submodule-recursive: "{submodule-recursive}"
wrappers:
- infra-wrappers:
- build-timeout: '{build-timeout}'
+ build-timeout: "{build-timeout}"
triggers:
- gerrit-trigger-patch-merged:
- server: '{server-name}'
- project: '{project}'
- branch: '{branch}'
- files: '{pattern}'
+ server: "{server-name}"
+ project: "{project}"
+ branch: "{branch}"
+ files: "{pattern}"
builders:
- multijob:
- name: 'build docker images'
+ name: "build docker images"
condition: ALWAYS
execution-type: PARALLEL
projects:
- - name: '{project-name}-amd64-{stream}-merge-java'
+ - name: "{project-name}-amd64-{stream}-merge-java"
kill-phase-on: FAILURE
current-parameters: true
- - name: '{project-name}-arm64-{stream}-merge-java'
+ - name: "{project-name}-arm64-{stream}-merge-java"
kill-phase-on: NEVER
current-parameters: true
- multijob:
- name: 'publish docker manifest'
+ name: "publish docker manifest"
condition: SUCCESSFUL
execution-type: PARALLEL
projects:
- - name: '{project-name}-docker-manifest-{stream}'
+ - name: "{project-name}-docker-manifest-{stream}"
current-parameters: true
predefined-parameters: |
PARENT_JOB_NAME=$JOB_NAME
diff --git a/jjb/global-templates-python.yaml b/jjb/global-templates-python.yaml
index 6f3c836..a2db6da 100644
--- a/jjb/global-templates-python.yaml
+++ b/jjb/global-templates-python.yaml
@@ -15,55 +15,72 @@
# pattern: ant file-path pattern relative to the workspace used to
# trigger the job
- name: '{project-name}-{stream}-{subproject}-verify-python'
- path: '$WORKSPACE'
+ name: "{project-name}-{stream}-{subproject}-verify-python"
+ path: "$WORKSPACE"
project-type: freestyle
concurrent: true
- node: '{build-node}'
+ node: "{build-node}"
properties:
- infra-properties:
- build-days-to-keep: '{build-days-to-keep}'
+ build-days-to-keep: "{build-days-to-keep}"
parameters:
- infra-parameters:
- project: '{project}'
- branch: '{branch}'
- refspec: 'refs/heads/{branch}'
- artifacts: '{archive-artifacts}'
+ project: "{project}"
+ branch: "{branch}"
+ refspec: "refs/heads/{branch}"
+ artifacts: "{archive-artifacts}"
- maven-exec:
- maven-version: '{maven-version}'
+ maven-version: "{maven-version}"
scm:
- gerrit-trigger-scm:
- refspec: '$GERRIT_REFSPEC'
- choosing-strategy: 'gerrit'
- submodule-recursive: '{submodule-recursive}'
+ refspec: "$GERRIT_REFSPEC"
+ choosing-strategy: "gerrit"
+ submodule-recursive: "{submodule-recursive}"
wrappers:
- infra-wrappers:
- build-timeout: '{build-timeout}'
+ build-timeout: "{build-timeout}"
triggers:
- gerrit-trigger-patch-submitted:
- server: '{server-name}'
- project: '{project}'
- branch: '{branch}'
- files: '{pattern}'
+ server: "{server-name}"
+ project: "{project}"
+ branch: "{branch}"
+ files: "{pattern}"
builders:
- lf-infra-pre-build
- provide-maven-settings:
- global-settings-file: 'global-settings'
- settings-file: '{mvn-settings}'
+ global-settings-file: "global-settings"
+ settings-file: "{mvn-settings}"
- shell: |
#!/bin/bash
- virtualenv $WORKSPACE/venv-tox
- source $WORKSPACE/venv-tox/bin/activate
- pip install --upgrade pip
- pip install --upgrade tox argparse
- pip freeze
+ # shellcheck disable=SC1090
+ source ~/lf-env.sh
+
+ lf-activate-venv --python python3.8 --venv-file /tmp/.toxenv \
+ tox virtualenv argparse webtest
+
+ if [[ -d /opt/pyenv ]]; then
+ echo "---> Setting up pyenv"
+ export PYENV_ROOT="/opt/pyenv"
+ export PATH="$PYENV_ROOT/bin:$PATH"
+ PYTHONPATH="$(pwd)"
+ export PYTHONPATH
+ export TOX_TESTENV_PASSENV=PYTHONPATH
+ fi
+
+ python -m pip install --upgrade pip
+
+ # Useful debugging
+ python --version
+ python -m pip freeze
+ tox --version
+
cd $WORKSPACE/{path}
tox
@@ -81,53 +98,53 @@
# Required Variables:
# branch: git branch (eg. stable/lithium or master)
- name: '{project-name}-{stream}-3scm-docker-shell-daily'
+ name: "{project-name}-{stream}-3scm-docker-shell-daily"
project-type: freestyle
- node: 'queue-docker-4c-4g'
+ node: "queue-docker-4c-4g"
properties:
- infra-properties:
- build-days-to-keep: '{build-days-to-keep}'
+ build-days-to-keep: "{build-days-to-keep}"
parameters:
- infra-parameters:
- project: '{project}'
- branch: '{branch}'
- refspec: 'refs/heads/{branch}'
- artifacts: '{archive-artifacts}'
+ project: "{project}"
+ branch: "{branch}"
+ refspec: "refs/heads/{branch}"
+ artifacts: "{archive-artifacts}"
- maven-exec:
- maven-version: '{maven-version}'
+ maven-version: "{maven-version}"
scm:
- gerrit-trigger-scm:
- refspec: ''
- choosing-strategy: 'default'
- submodule-recursive: '{submodule-recursive}'
+ refspec: ""
+ choosing-strategy: "default"
+ submodule-recursive: "{submodule-recursive}"
wrappers:
- infra-wrappers-docker-build:
- build-timeout: '{build-timeout}'
+ build-timeout: "{build-timeout}"
triggers:
- - timed: 'H */4 * * *'
+ - timed: "H */4 * * *"
- gerrit-trigger-release-manually:
- server: '{server-name}'
- project: '{project}'
- branch: '{branch}'
+ server: "{server-name}"
+ project: "{project}"
+ branch: "{branch}"
- gerrit-trigger-patch-merged:
- server: '{server-name}'
- project: '{project}'
- branch: '{branch}'
- files: '**'
+ server: "{server-name}"
+ project: "{project}"
+ branch: "{branch}"
+ files: "**"
builders:
- lf-infra-pre-build
- provide-maven-settings:
- global-settings-file: 'global-settings'
- settings-file: '{mvn-settings}'
+ global-settings-file: "global-settings"
+ settings-file: "{mvn-settings}"
- inject:
properties-file: version.properties
- docker-login
- - shell: '{script}'
+ - shell: "{script}"
publishers:
- lf-infra-publish
diff --git a/jjb/global-templates-script.yaml b/jjb/global-templates-script.yaml
index 3dbe82d..31db6d5 100644
--- a/jjb/global-templates-script.yaml
+++ b/jjb/global-templates-script.yaml
@@ -1,6 +1,4 @@
---
-# vim: sw=2 ts=2 sts=2 et :
-
- job-template:
#
# job template for verifying gerrit changeset by shell script
@@ -15,41 +13,41 @@
# Optional Variables:
# pattern: trigger job only if modification covered file in pattern
# build-node: label(flavor) of jenkins slave
- name: '{project-name}-{stream}-{area}-verify-shell'
- node: '{build-node}'
+ name: "{project-name}-{stream}-{area}-verify-shell"
+ node: "{build-node}"
type: freestyle
concurrent: true
disable-job: false
- disabled: '{disable-job}'
+ disabled: "{disable-job}"
- pattern: '**'
+ pattern: "**"
parameters:
- lf-infra-parameters:
- branch: '{branch}'
- project: '{project}'
- stream: '{stream}'
- lftools-version: '{lftools-version}'
+ branch: "{branch}"
+ project: "{project}"
+ stream: "{stream}"
+ lftools-version: "{lftools-version}"
scm:
- gerrit-trigger-scm:
- refspec: '$GERRIT_REFSPEC'
- submodule-recursive: '{submodule-recursive}'
- choosing-strategy: 'gerrit'
+ refspec: "$GERRIT_REFSPEC"
+ submodule-recursive: "{submodule-recursive}"
+ choosing-strategy: "gerrit"
triggers:
- gerrit-trigger-patch-submitted:
- server: '{server-name}'
- project: '{project}'
- branch: '{branch}'
- files: '{pattern}'
+ server: "{server-name}"
+ project: "{project}"
+ branch: "{branch}"
+ files: "{pattern}"
wrappers:
- infra-wrappers:
- build-timeout: '{build-timeout}'
+ build-timeout: "{build-timeout}"
builders:
- - shell: '{script}'
+ - shell: "{script}"
publishers:
- lf-infra-publish
@@ -69,67 +67,65 @@
# $WORKSPACE as it will destroy the initial
# project checkout
- name: '{project-name}-{stream}-two-scm-verify-script'
+ name: "{project-name}-{stream}-two-scm-verify-script"
project-type: freestyle
concurrent: true
- node: '{build-node}'
+ node: "{build-node}"
properties:
- infra-properties:
- build-days-to-keep: '{build-days-to-keep}'
+ build-days-to-keep: "{build-days-to-keep}"
parameters:
- infra-parameters:
- project: '{project}'
- branch: '{branch}'
- refspec: 'refs/heads/{branch}'
- artifacts: '{archive-artifacts}'
+ project: "{project}"
+ branch: "{branch}"
+ refspec: "refs/heads/{branch}"
+ artifacts: "{archive-artifacts}"
- maven-exec:
- maven-version: '{maven-version}'
+ maven-version: "{maven-version}"
scm:
- gerrit-trigger-scm:
- refspec: '$GERRIT_REFSPEC'
- choosing-strategy: 'gerrit'
- submodule-recursive: '{submodule-recursive}'
+ refspec: "$GERRIT_REFSPEC"
+ choosing-strategy: "gerrit"
+ submodule-recursive: "{submodule-recursive}"
- git-extra-project:
- project: '{extra-project}'
- refspec: '{extra-refspec}'
- branch: '{extra-branch}'
- checkout-dir: '{checkout-dir}'
+ project: "{extra-project}"
+ refspec: "{extra-refspec}"
+ branch: "{extra-branch}"
+ checkout-dir: "{checkout-dir}"
wrappers:
- infra-wrappers:
- build-timeout: '{build-timeout}'
+ build-timeout: "{build-timeout}"
triggers:
- gerrit-trigger-patch-submitted:
- server: '{server-name}'
- project: '{project}'
- branch: '{branch}'
- files: '**'
+ server: "{server-name}"
+ project: "{project}"
+ branch: "{branch}"
+ files: "**"
builders:
- lf-infra-pre-build
- provide-maven-settings:
- global-settings-file: 'global-settings'
- settings-file: '{mvn-settings}'
+ global-settings-file: "global-settings"
+ settings-file: "{mvn-settings}"
# make sure maven gets installed / setup
- maven-target:
- maven-version: '{maven-version}'
- goals: '--version'
- settings: '{mvn-settings}'
+ maven-version: "{maven-version}"
+ goals: "--version"
+ settings: "{mvn-settings}"
settings-type: cfp
- global-settings: 'global-settings'
+ global-settings: "global-settings"
global-settings-type: cfp
- - shell: '{script}'
+ - shell: "{script}"
publishers:
- lf-infra-publish
-# vim: sw=2 ts=2 sts=2 et :
-
- job-template:
# Job template for two scm and script trigger - for docker merge
#
@@ -138,62 +134,62 @@
# build-node: what build node to run on
# script: build script to execute
- name: '{project-name}-{stream}-two-scm-merge-docker-script'
+ name: "{project-name}-{stream}-two-scm-merge-docker-script"
project-type: freestyle
concurrent: true
- node: '{build-node}'
+ node: "{build-node}"
properties:
- infra-properties:
- build-days-to-keep: '{build-days-to-keep}'
+ build-days-to-keep: "{build-days-to-keep}"
parameters:
- infra-parameters:
- project: '{project}'
- branch: '{branch}'
- refspec: 'refs/heads/{branch}'
- artifacts: '{archive-artifacts}'
+ project: "{project}"
+ branch: "{branch}"
+ refspec: "refs/heads/{branch}"
+ artifacts: "{archive-artifacts}"
- maven-exec:
- maven-version: '{maven-version}'
+ maven-version: "{maven-version}"
scm:
- gerrit-trigger-scm:
- refspec: ''
- choosing-strategy: 'default'
- submodule-recursive: '{submodule-recursive}'
+ refspec: ""
+ choosing-strategy: "default"
+ submodule-recursive: "{submodule-recursive}"
- git-extra-project:
- project: '{extra-project}'
- refspec: '{extra-refspec}'
- branch: '{extra-branch}'
- checkout-dir: '{checkout-dir}'
+ project: "{extra-project}"
+ refspec: "{extra-refspec}"
+ branch: "{extra-branch}"
+ checkout-dir: "{checkout-dir}"
wrappers:
- infra-wrappers:
- build-timeout: '{build-timeout}'
+ build-timeout: "{build-timeout}"
triggers:
- gerrit-trigger-patch-merged:
- server: '{server-name}'
- project: '{project}'
- branch: '{branch}'
- files: '**'
+ server: "{server-name}"
+ project: "{project}"
+ branch: "{branch}"
+ files: "**"
builders:
- lf-infra-pre-build
- provide-maven-settings:
- global-settings-file: 'global-settings'
- settings-file: '{mvn-settings}'
+ global-settings-file: "global-settings"
+ settings-file: "{mvn-settings}"
- docker-login
# make sure maven gets installed / setup
- maven-target:
- maven-version: '{maven-version}'
- goals: '--version'
- settings: '{mvn-settings}'
+ maven-version: "{maven-version}"
+ goals: "--version"
+ settings: "{mvn-settings}"
settings-type: cfp
- global-settings: 'global-settings'
+ global-settings: "global-settings"
global-settings-type: cfp
- - shell: '{script}'
+ - shell: "{script}"
publishers:
- lf-infra-publish
@@ -206,61 +202,61 @@
# build-node: what build node to run on
# script: build script to execute
- name: '{project-name}-{stream}-two-scm-release-docker-script-manual'
+ name: "{project-name}-{stream}-two-scm-release-docker-script-manual"
project-type: freestyle
concurrent: true
- node: '{build-node}'
+ node: "{build-node}"
properties:
- infra-properties:
- build-days-to-keep: '{build-days-to-keep}'
+ build-days-to-keep: "{build-days-to-keep}"
parameters:
- infra-parameters:
- project: '{project}'
- branch: '{branch}'
- refspec: 'refs/heads/{branch}'
- artifacts: '{archive-artifacts}'
+ project: "{project}"
+ branch: "{branch}"
+ refspec: "refs/heads/{branch}"
+ artifacts: "{archive-artifacts}"
- maven-exec:
- maven-version: '{maven-version}'
+ maven-version: "{maven-version}"
scm:
- gerrit-trigger-scm:
- refspec: ''
- choosing-strategy: 'default'
- submodule-recursive: '{submodule-recursive}'
+ refspec: ""
+ choosing-strategy: "default"
+ submodule-recursive: "{submodule-recursive}"
- git-extra-project:
- project: '{extra-project}'
- refspec: '{extra-refspec}'
- branch: '{extra-branch}'
- checkout-dir: '{checkout-dir}'
+ project: "{extra-project}"
+ refspec: "{extra-refspec}"
+ branch: "{extra-branch}"
+ checkout-dir: "{checkout-dir}"
wrappers:
- infra-wrappers:
- build-timeout: '{build-timeout}'
+ build-timeout: "{build-timeout}"
triggers:
- gerrit-trigger-release-manually:
- server: '{server-name}'
- project: '{project}'
- branch: '{branch}'
+ server: "{server-name}"
+ project: "{project}"
+ branch: "{branch}"
builders:
- lf-infra-pre-build
- provide-maven-settings:
- global-settings-file: 'global-settings'
- settings-file: '{mvn-settings}'
+ global-settings-file: "global-settings"
+ settings-file: "{mvn-settings}"
- docker-login
# make sure maven gets installed / setup
- maven-target:
- maven-version: '{maven-version}'
- goals: '--version'
- settings: '{mvn-settings}'
+ maven-version: "{maven-version}"
+ goals: "--version"
+ settings: "{mvn-settings}"
settings-type: cfp
- global-settings: 'global-settings'
+ global-settings: "global-settings"
global-settings-type: cfp
- - shell: '{script}'
+ - shell: "{script}"
publishers:
- lf-infra-publish
diff --git a/jjb/holmes/holmes-common.yaml b/jjb/holmes/holmes-common.yaml
index 20e0f61..c62c99c 100644
--- a/jjb/holmes/holmes-common.yaml
+++ b/jjb/holmes/holmes-common.yaml
@@ -7,32 +7,26 @@
- project:
name: holmes-common
- project-name: 'holmes-common'
+ project-name: "holmes-common"
jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
+ - "{project-name}-{stream}-verify-java"
+ - "{project-name}-{stream}-merge-java"
- gerrit-maven-stage:
sign-artifacts: true
- build-node: centos7-builder-4c-4g
+ build-node: centos8-docker-4c-4g
maven-versions-plugin: true
java-version: openjdk11
sbom-generator: true
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
java-version: openjdk11
- project: 'holmes/common'
+ project: "holmes/common"
stream:
- - 'master':
- branch: 'master'
- - 'guilin':
- branch: 'guilin'
- - 'honolulu':
- branch: 'honolulu'
- - 'istanbul':
- branch: 'istanbul'
- mvn-settings: 'holmes-common-settings'
- files: '**'
- archive-artifacts: ''
+ - "master":
+ branch: "master"
+ mvn-settings: "holmes-common-settings"
+ files: "**"
+ archive-artifacts: ""
build-node: ubuntu1804-builder-4c-4g
java-version: openjdk11
@@ -41,29 +35,28 @@
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
build-node: ubuntu1804-builder-4c-4g
- project: 'holmes/common'
- project-name: 'holmes-common'
- branch: 'master'
- mvn-settings: 'holmes-common-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ project: "holmes/common"
+ project-name: "holmes-common"
+ branch: "master"
+ mvn-settings: "holmes-common-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
java-version: openjdk11
- project:
name: holmes-common-clm
jobs:
- gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
+ nexus-iq-namespace: "onap-"
project: holmes/common
- project-name: 'holmes-common'
- branch: 'master'
- mvn-settings: 'holmes-common-settings'
+ project-name: "holmes-common"
+ branch: "master"
+ mvn-settings: "holmes-common-settings"
java-version: openjdk11
- project:
@@ -71,6 +64,6 @@
project-name: holmes-common
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: holmes/common
branch: master
diff --git a/jjb/holmes/holmes-engine-mgt.yaml b/jjb/holmes/holmes-engine-mgt.yaml
index 1c49166..bb04621 100644
--- a/jjb/holmes/holmes-engine-mgt.yaml
+++ b/jjb/holmes/holmes-engine-mgt.yaml
@@ -1,37 +1,31 @@
---
- project:
name: holmes-engine-management
- project-name: 'holmes-engine-management'
+ project-name: "holmes-engine-management"
jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
+ - "{project-name}-{stream}-verify-java"
+ - "{project-name}-{stream}-merge-java"
- gerrit-maven-stage:
sign-artifacts: true
- build-node: centos7-builder-4c-4g
+ build-node: centos8-docker-4c-4g
maven-versions-plugin: true
java-version: openjdk11
sbom-generator: true
- - '{project-name}-{stream}-docker-java-daily':
- mvn-params: '-Dmaven.test.skip=true'
+ - "{project-name}-{stream}-docker-java-daily":
+ mvn-params: "-Dmaven.test.skip=true"
build-node: ubuntu1804-docker-8c-8g
java-version: openjdk11
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
java-version: openjdk11
- project: 'holmes/engine-management'
+ project: "holmes/engine-management"
stream:
- - 'master':
- branch: 'master'
- - 'guilin':
- branch: 'guilin'
- - 'honolulu':
- branch: 'honolulu'
- - 'istanbul':
- branch: 'istanbul'
- mvn-settings: 'holmes-engine-management-settings'
- files: '**'
- archive-artifacts: ''
- docker-pom: 'pom.xml'
+ - "master":
+ branch: "master"
+ mvn-settings: "holmes-engine-management-settings"
+ files: "**"
+ archive-artifacts: ""
+ docker-pom: "pom.xml"
mvn-profile: docker
build-node: ubuntu1804-builder-4c-4g
java-version: openjdk11
@@ -41,29 +35,28 @@
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
build-node: ubuntu1804-builder-4c-4g
- project: 'holmes/engine-management'
- project-name: 'holmes-engine-management'
- branch: 'master'
- mvn-settings: 'holmes-engine-management-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ project: "holmes/engine-management"
+ project-name: "holmes-engine-management"
+ branch: "master"
+ mvn-settings: "holmes-engine-management-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
java-version: openjdk11
- project:
name: holmes-engine-management-clm
jobs:
- gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
+ nexus-iq-namespace: "onap-"
project: holmes/engine-management
- project-name: 'holmes-engine-management'
- branch: 'master'
- mvn-settings: 'holmes-engine-management-settings'
+ project-name: "holmes-engine-management"
+ branch: "master"
+ mvn-settings: "holmes-engine-management-settings"
java-version: openjdk11
- project:
@@ -71,6 +64,6 @@
project-name: holmes-engine-management
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: holmes/engine-management
branch: master
diff --git a/jjb/holmes/holmes-rule-mgt.yaml b/jjb/holmes/holmes-rule-mgt.yaml
index 1177923..ff70728 100644
--- a/jjb/holmes/holmes-rule-mgt.yaml
+++ b/jjb/holmes/holmes-rule-mgt.yaml
@@ -1,37 +1,31 @@
---
- project:
name: holmes-rule-management
- project-name: 'holmes-rule-management'
+ project-name: "holmes-rule-management"
jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
+ - "{project-name}-{stream}-verify-java"
+ - "{project-name}-{stream}-merge-java"
- gerrit-maven-stage:
sign-artifacts: true
- build-node: centos7-builder-4c-4g
+ build-node: centos8-docker-4c-4g
maven-versions-plugin: true
java-version: openjdk11
sbom-generator: true
- - '{project-name}-{stream}-docker-java-daily':
- mvn-params: '-Dmaven.test.skip=true'
+ - "{project-name}-{stream}-docker-java-daily":
+ mvn-params: "-Dmaven.test.skip=true"
build-node: ubuntu1804-docker-8c-8g
java-version: openjdk11
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
java-version: openjdk11
- project: 'holmes/rule-management'
+ project: "holmes/rule-management"
stream:
- - 'master':
- branch: 'master'
- - 'guilin':
- branch: 'guilin'
- - 'honolulu':
- branch: 'honolulu'
- - 'istanbul':
- branch: 'istanbul'
- mvn-settings: 'holmes-rule-management-settings'
- files: '**'
- archive-artifacts: ''
- docker-pom: 'pom.xml'
+ - "master":
+ branch: "master"
+ mvn-settings: "holmes-rule-management-settings"
+ files: "**"
+ archive-artifacts: ""
+ docker-pom: "pom.xml"
mvn-profile: docker
build-node: ubuntu1804-builder-4c-4g
java-version: openjdk11
@@ -41,29 +35,28 @@
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
build-node: ubuntu1804-builder-4c-4g
- project: 'holmes/rule-management'
- project-name: 'holmes-rule-management'
- branch: 'master'
- mvn-settings: 'holmes-rule-management-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ project: "holmes/rule-management"
+ project-name: "holmes-rule-management"
+ branch: "master"
+ mvn-settings: "holmes-rule-management-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
java-version: openjdk11
- project:
name: holmes-rule-management-clm
jobs:
- gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
+ nexus-iq-namespace: "onap-"
project: holmes/rule-management
- project-name: 'holmes-rule-management'
- branch: 'master'
- mvn-settings: 'holmes-rule-management-settings'
+ project-name: "holmes-rule-management"
+ branch: "master"
+ mvn-settings: "holmes-rule-management-settings"
java-version: openjdk11
- project:
@@ -71,6 +64,6 @@
project-name: holmes-rule-management
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: holmes/rule-management
branch: master
diff --git a/jjb/integration/docker/integration-docker-onap-java11.yaml b/jjb/integration/docker/integration-docker-onap-java11.yaml
index 4ad47ab..3a32648 100644
--- a/jjb/integration/docker/integration-docker-onap-java11.yaml
+++ b/jjb/integration/docker/integration-docker-onap-java11.yaml
@@ -1,63 +1,72 @@
---
- project:
- name: integration-docker-onap-java11-info
- project-name: integration-docker-onap-java11
+ name: integration-docker-onap-java-info
+ project-name: integration-docker-onap-java
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: integration/docker/onap-java11
branch: master
- project:
- name: integration-docker-onap-java11-linters
- project: integration/docker/onap-java11
- project-name: integration-docker-onap-java11
- 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'
- - 'md':
- tox-dir: '.'
- tox-envs: 'md'
- pattern: '**/*.md'
- stream:
- - 'master':
- branch: 'master'
-
-- project:
- name: integration-docker-onap-java11-release
- project-name: 'integration-docker-onap-java11'
- project: 'integration/docker/onap-java11'
- mvn-settings: 'integration-settings'
+ name: integration-docker-onap-java-linters
+ project: integration/docker/onap-java11
+ project-name: integration-docker-onap-java
+ python-version: python3
jobs:
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
-
-- project:
- name: 'integration-docker-onap-java11-docker'
- jobs:
- - gerrit-docker-verify
- - gerrit-docker-merge
- project-name: 'integration-docker-onap-java11'
- project: 'integration/docker/onap-java11'
+ - 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"
+ - "md":
+ tox-dir: "."
+ tox-envs: "md"
+ pattern: "**/*.md"
stream:
- - 'master':
- branch: 'master'
- files: ''
- docker-name: 'onap/integration-java11'
- docker-build-args: '-f ./Dockerfile'
- docker-root: '$WORKSPACE'
- mvn-settings: 'integration-settings'
+ - "master":
+ branch: "master"
+
+- project:
+ name: integration-docker-onap-java-release
+ project-name: "integration-docker-onap-java"
+ project: "integration/docker/onap-java11"
+ mvn-settings: "integration-settings"
+ jobs:
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
+
+- project:
+ name: "integration-docker-onap-java-docker"
+ jobs:
+ - gerrit-docker-verify:
+ project-name: "integration-docker-onap-java11"
+ docker-name: "onap/integration-java11"
+ - gerrit-docker-merge:
+ project-name: "integration-docker-onap-java11"
+ docker-name: "onap/integration-java11"
+ - gerrit-docker-verify:
+ project-name: "integration-docker-onap-java17"
+ docker-name: "onap/integration-java17"
+ docker-build-args: "--build-arg java_ver=onap-java17"
+ - gerrit-docker-merge:
+ project-name: "integration-docker-onap-java17"
+ docker-name: "onap/integration-java17"
+ docker-build-args: "--build-arg java_ver=onap-java17"
+ project: "integration/docker/onap-java11"
+ stream:
+ - "master":
+ branch: "master"
+ files: ""
+ docker-root: "$WORKSPACE"
+ mvn-settings: "integration-settings"
build-node: ubuntu1804-docker-8c-8g
diff --git a/jjb/integration/docker/integration-docker-onap-python.yaml b/jjb/integration/docker/integration-docker-onap-python.yaml
index f74b5b3..dc7c2ff 100644
--- a/jjb/integration/docker/integration-docker-onap-python.yaml
+++ b/jjb/integration/docker/integration-docker-onap-python.yaml
@@ -9,55 +9,55 @@
branch: master
- project:
- name: integration-docker-onap-python-linters
- project: integration/docker/onap-python
- project-name: integration-docker-onap-python
- 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'
- - 'md':
- tox-dir: '.'
- tox-envs: 'md'
- pattern: '**/*.md'
- stream:
- - 'master':
- branch: 'master'
+ name: integration-docker-onap-python-linters
+ project: integration/docker/onap-python
+ project-name: integration-docker-onap-python
+ 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"
+ - "md":
+ tox-dir: "."
+ tox-envs: "md"
+ pattern: "**/*.md"
+ stream:
+ - "master":
+ branch: "master"
- project:
name: integration-docker-onap-python-release
- project-name: 'integration-docker-onap-python'
- project: 'integration/docker/onap-python'
- mvn-settings: 'integration-settings'
+ project-name: "integration-docker-onap-python"
+ project: "integration/docker/onap-python"
+ mvn-settings: "integration-settings"
jobs:
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
- project:
- name: 'integration-docker-onap-python-docker'
+ name: "integration-docker-onap-python-docker"
jobs:
- gerrit-docker-verify
- gerrit-docker-merge
- project-name: 'integration-docker-onap-python'
- project: 'integration/docker/onap-python'
+ project-name: "integration-docker-onap-python"
+ project: "integration/docker/onap-python"
stream:
- - 'master':
- branch: 'master'
- files: ''
- docker-name: 'onap/integration-python'
- docker-build-args: '-f ./Dockerfile'
- docker-root: '$WORKSPACE'
- mvn-settings: 'integration-settings'
+ - "master":
+ branch: "master"
+ files: ""
+ docker-name: "onap/integration-python"
+ docker-build-args: "-f ./Dockerfile"
+ docker-root: "$WORKSPACE"
+ mvn-settings: "integration-settings"
build-node: ubuntu1804-docker-8c-8g
diff --git a/jjb/integration/include-raw-integration-install-robotframework-py3.sh b/jjb/integration/include-raw-integration-install-robotframework-py3.sh
new file mode 100644
index 0000000..efeb0f7
--- /dev/null
+++ b/jjb/integration/include-raw-integration-install-robotframework-py3.sh
@@ -0,0 +1,173 @@
+#!/bin/bash -l
+# SPDX-License-Identifier: EPL-1.0
+##############################################################################
+# Copyright (c) 2022 The Linux Foundation and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+##############################################################################
+# vim: sw=4 ts=4 sts=4 et ft=sh :
+
+set -euxo pipefail
+
+echo "---> install-robotframework-py3.sh"
+
+### Common variables
+
+REQUIRED_PYTHON="3.7.0"
+
+### Common functions
+
+# Allows for the comparison of two Python version strings
+ver_cmp()
+{
+ local IFS=.
+ # shellcheck disable=SC2206
+ local V1=($1) V2=($2) I
+ for ((I=0 ; I<${#V1[*]} || I<${#V2[*]} ; I++)) ; do
+ [[ ${V1[$I]:-0} -lt ${V2[$I]:-0} ]] && echo -1 && return
+ [[ ${V1[$I]:-0} -gt ${V2[$I]:-0} ]] && echo 1 && return
+ done
+ echo 0
+}
+# Checks if first version/string is greater than or equal to the second
+ver_ge()
+{
+ [[ ! $(ver_cmp "$1" "$2") -eq -1 ]]
+}
+
+### Main script entry point
+
+# Check for required Python versions and activate/warn appropriately
+# Use PYENV for selecting the latest python version, if available
+if [[ -d "/opt/pyenv" ]]; then
+ echo "Setup pyenv:"
+ export PYENV_ROOT="/opt/pyenv"
+ export PATH="$PYENV_ROOT/bin:$PATH"
+ pyenv versions
+ if command -v pyenv 1>/dev/null 2>&1; then
+ eval "$(pyenv init - --no-rehash)"
+ # Choose the latest numeric Python version from installed list
+ version=$(pyenv versions --bare | sed '/^[^0-9]/d' |\
+ sort -V | tail -n 1)
+ pyenv local "${version}"
+ fi
+fi
+
+# Store the active/current Python3 version
+PYTHON_VERSION=$(python3 --version | awk '{print $2}')
+
+# Check that the required minimum version has been met
+if ! (ver_ge "${PYTHON_VERSION}" "${REQUIRED_PYTHON}"); then
+ echo "Warning: possible Python version problem"
+ echo "Python ${PYTHON_VERSION} does not meet requirement: ${REQUIRED_PYTHON}"
+fi
+
+if (python3 -m robot.run --version > /dev/null 2>&1); then
+ echo "Working robot framework found; no installation necessary"
+ echo "Installed under Python version: ${PYTHON_VERSION}"
+ exit 0
+fi
+
+
+# Create a requirements file; keep it around for potential later use
+# Versions and dependencies below have been carefully tested for Python3
+cat << 'EOF' > "requirements.txt"
+paramiko
+six
+urllib3
+docker-py
+ipaddr
+netaddr
+netifaces
+pyhocon
+requests
+selenium<4.6.0,>=4.0.0
+robotframework
+robotframework-httplibrary
+robotframework-requests==0.9.3
+robotframework-selenium2library
+robotframework-sshlibrary
+scapy
+# Module jsonpath is needed by current AAA idmlite suite.
+jsonpath-rw
+# Modules for longevity framework robot library
+elasticsearch<8.0.0,>=7.0.0
+elasticsearch-dsl
+# Module for pyangbind used by lispflowmapping project
+pyangbind
+# Module for iso8601 datetime format
+isodate
+# Module for TemplatedRequests.robot library
+jmespath
+# Module for backup-restore support library
+jsonpatch
+pbr
+deepdiff
+dnspython
+future
+jinja2
+kafka-python
+# Protobuf requires Python >=3.7
+protobuf
+pyyaml
+robotlibcore-temp
+more-itertools
+xvfbwrapper
+PyVirtualDisplay
+# Additional package dependencies for ONAP project
+# odltools for extra debugging
+# Generates warning:
+# ERROR: odltools 0.1.34 has requirement requests~=2.19.1,
+# but you'll have requests 2.28.1 which is incompatible.
+odltools
+EOF
+
+
+if [[ -f ~/lf-env.sh ]]; then
+ echo "Installing robot-framework using LF common tooling"
+ # shellcheck disable=SC1090
+ source ~/lf-env.sh
+
+ # Create a virtual environment for robot tests and make sure setuptools & wheel
+ # are up-to-date in addition to pip
+ lf-activate-venv --python python3 --venv-file "${WORKSPACE}/.robot3_venv" \
+ setuptools \
+ pip \
+ wheel
+
+ # Install the robot framework and other dependencies
+ python3 -m pip install -r requirements.txt
+
+ # Save the virtual environment in ROBOT3_VENV
+ ROBOT3_VENV="$(cat "${WORKSPACE}/.robot3_venv")"
+
+else
+ echo "Installing robot-framework in a virtual environment"
+ if [[ -z "${WORKSPACE}" ]]; then
+ # Use a temporary folder location
+ WORKSPACE="/tmp"
+ ROBOT3_VENV=$(mktemp -d --suffix=-robot3_venv)
+ else
+ ROBOT3_VENV="${WORKSPACE}/.robot3_venv"
+ fi
+
+ # The --system-site-packages parameter allows us to pick up system level
+ # installed packages. This allows us to bake matplotlib which takes very long
+ # to install into the image.
+ python3 -m venv --system-site-packages "${ROBOT3_VENV}"
+ source "${ROBOT3_VENV}/bin/activate"
+
+ echo "Installing robot-framework using basic methods"
+ python3 -m pip install -r requirements.txt
+fi
+
+# Store the virtual environment location
+echo "ROBOT3_VENV=${ROBOT3_VENV}" >> "${WORKSPACE}/env.properties"
+
+# Display versioning/debugging output
+python3 --version
+python3 -m pip freeze
+python3 -m robot.run --version || :
diff --git a/jjb/integration/include-raw-integration-robotframework.sh b/jjb/integration/include-raw-integration-robotframework.sh
deleted file mode 100644
index 7f4ed49..0000000
--- a/jjb/integration/include-raw-integration-robotframework.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-
-##############################################################################
-# Copyright (c) 2016 The Linux Foundation and others.
-##############################################################################
-
-ROBOT3_VENV=$(mktemp -d --suffix=robot3_venv)
-echo "ROBOT3_VENV=${ROBOT3_VENV}" >> "${WORKSPACE}/env.properties"
-
-# The --system-site-packages parameter allows us to pick up system level
-# installed packages. This allows us to bake matplotlib which takes very long
-# to install into the image.
-virtualenv --system-site-packages "${ROBOT3_VENV}"
-source "${ROBOT3_VENV}/bin/activate"
-
-set -exu
-
-# Make sure pip itself us up-to-date.
-pip3 install --upgrade pip
-
-pip3 install --no-binary pycparser cffi setuptools-rust
-pip3 install pyOpenSSL docker-py importlib requests scapy netifaces netaddr ipaddr simplejson demjson
-pip3 install robotframework-httplibrary robotframework-requests robotframework-sshlibrary robotframework-selenium2library robotframework-xvfb
-
-pip3 install xvfbwrapper
-pip3 install PyVirtualDisplay
-
-# Print installed versions.
-pip3 freeze
-
-# Check robot module is available and working
-python3 -m robot.run --version
-
-# vim: sw=4 ts=4 sts=4 et ft=sh :
diff --git a/jjb/integration/integration-csit.yaml b/jjb/integration/integration-csit.yaml
index b28ddb2..d401281 100644
--- a/jjb/integration/integration-csit.yaml
+++ b/jjb/integration/integration-csit.yaml
@@ -2,19 +2,19 @@
- project:
name: integration-csit
jobs:
- - '{project-name}-{stream}-verify-csit-{functionality}'
- - '{project-name}-{stream}-csit-{functionality}'
- project-name: 'integration'
- recipients: 'morgan.richomm@orange.com bf1936@att.com'
+ - "{project-name}-{stream}-verify-csit-{functionality}"
+ - "{project-name}-{stream}-csit-{functionality}"
+ project-name: "integration"
+ recipients: "morgan.richomm@orange.com bf1936@att.com"
stream:
- - 'master':
- branch: 'master'
+ - "master":
+ branch: "master"
functionality:
- - 'functionality1':
+ - "functionality1":
trigger_jobs:
- - 'vCPE':
+ - "vCPE":
trigger_jobs:
- robot-options: ''
+ robot-options: ""
- project:
name: integration-csit-info
diff --git a/jjb/integration/integration-data-provider.yaml b/jjb/integration/integration-data-provider.yaml
index 3ec66f8..3c02f4e 100644
--- a/jjb/integration/integration-data-provider.yaml
+++ b/jjb/integration/integration-data-provider.yaml
@@ -15,70 +15,70 @@
- project:
name: integration-data-provider-linters
- project: 'integration/data-provider'
- project-name: 'integration-data-provider'
+ project: "integration/data-provider"
+ project-name: "integration-data-provider"
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'
- - 'rst':
- tox-dir: '.'
- tox-envs: 'rst'
- pattern: '**/*.rst'
- - 'md':
- tox-dir: '.'
- tox-envs: 'md'
- pattern: '**/*.md'
- - 'cov':
- tox-dir: '.'
- tox-envs: 'cov'
- pattern: '**/*.py'
- - 'mypy':
- tox-dir: '.'
- tox-envs: 'mypy'
- pattern: '**/*.py'
+ - "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"
+ - "rst":
+ tox-dir: "."
+ tox-envs: "rst"
+ pattern: "**/*.rst"
+ - "md":
+ tox-dir: "."
+ tox-envs: "md"
+ pattern: "**/*.md"
+ - "cov":
+ tox-dir: "."
+ tox-envs: "cov"
+ pattern: "**/*.py"
+ - "mypy":
+ tox-dir: "."
+ tox-envs: "mypy"
+ pattern: "**/*.py"
stream:
- - 'master':
- branch: 'master'
+ - "master":
+ branch: "master"
- project:
- name: 'integration-data-provider-docker-verify'
+ name: "integration-data-provider-docker-verify"
jobs:
- gerrit-docker-verify
- gerrit-docker-merge
- project-name: 'integration-data-provider'
- project: 'integration/data-provider'
+ project-name: "integration-data-provider"
+ project: "integration/data-provider"
stream:
- - 'master':
- branch: 'master'
- files: ''
- docker-build-args: '-f ./Dockerfile'
- docker-name: 'onap/data-provider'
- docker-root: '$WORKSPACE'
- mvn-settings: 'integration-settings'
+ - "master":
+ branch: "master"
+ files: ""
+ docker-build-args: "-f ./Dockerfile"
+ docker-name: "onap/data-provider"
+ docker-root: "$WORKSPACE"
+ mvn-settings: "integration-settings"
build-node: ubuntu1804-docker-8c-8g
- project:
name: integration-data-provider-release
- project-name: 'integration-data-provider'
- project: 'integration/data-provider'
- mvn-settings: 'integration-settings'
+ project-name: "integration-data-provider"
+ project: "integration/data-provider"
+ mvn-settings: "integration-settings"
jobs:
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
diff --git a/jjb/integration/integration-docker-compose.yaml b/jjb/integration/integration-docker-compose.yaml
index c3a2ab9..2c02ed1 100644
--- a/jjb/integration/integration-docker-compose.yaml
+++ b/jjb/integration/integration-docker-compose.yaml
@@ -1,52 +1,52 @@
---
- project:
name: integration-docker-compose
- project-name: 'integration'
- project: 'integration'
+ project-name: "integration"
+ project: "integration"
stream:
- - 'master':
- branch: 'master'
+ - "master":
+ branch: "master"
jobs:
- integration-docker-compose-verify
subproject:
- - 'netconf-pnp-simulator':
- pattern: 'test/mocks/netconf-pnp-simulator/modules/**'
- docker_root: 'test/mocks/netconf-pnp-simulator/modules'
- netconf_sim_service_name: 'netconf-pnp-simulator'
+ - "netconf-pnp-simulator":
+ pattern: "test/mocks/netconf-pnp-simulator/modules/**"
+ docker_root: "test/mocks/netconf-pnp-simulator/modules"
+ netconf_sim_service_name: "netconf-pnp-simulator"
script: |
#!/bin/bash
cd $DOCKER_ROOT
docker-compose up -d
post_script: !include-raw-escape: netconf-pnp-simulator-verify.sh
- - 'emssimulator-swm-netconf':
- pattern: 'test/mocks/emssimulator/swm-netconf/**'
- docker_root: 'test/mocks/emssimulator/swm-netconf'
- netconf_sim_service_name: 'ems-netconf-swm'
+ - "emssimulator-swm-netconf":
+ pattern: "test/mocks/emssimulator/swm-netconf/**"
+ docker_root: "test/mocks/emssimulator/swm-netconf"
+ netconf_sim_service_name: "ems-netconf-swm"
script: |
#!/bin/bash
cd $DOCKER_ROOT
docker-compose up -d
post_script: !include-raw-escape: netconf-pnp-simulator-verify.sh
- - 'pmsh-pnf-sim':
- pattern: 'test/mocks/pmsh-pnf-sim/docker-compose/**'
- docker_root: 'test/mocks/pmsh-pnf-sim/docker-compose'
- netconf_sim_service_name: 'netopeer2'
+ - "pmsh-pnf-sim":
+ pattern: "test/mocks/pmsh-pnf-sim/docker-compose/**"
+ docker_root: "test/mocks/pmsh-pnf-sim/docker-compose"
+ netconf_sim_service_name: "netopeer2"
script: |
#!/bin/bash
cd $DOCKER_ROOT
docker-compose up -d
post_script: !include-raw-escape: netconf-pnp-simulator-verify.sh
- - 'datafilecollector-testharness':
- pattern: 'test/mocks/datafilecollector-testharness/**'
- docker_root: 'test/mocks/datafilecollector-testharness/simulator-group'
+ - "datafilecollector-testharness":
+ pattern: "test/mocks/datafilecollector-testharness/**"
+ docker_root: "test/mocks/datafilecollector-testharness/simulator-group"
script: |
#!/bin/bash
cd $DOCKER_ROOT
./prepare-images.sh
./docker-compose-setup.sh
- - 'prov-mns-provider':
- pattern: 'test/mocks/prov-mns-provider/**'
- docker_root: 'test/mocks/prov-mns-provider'
+ - "prov-mns-provider":
+ pattern: "test/mocks/prov-mns-provider/**"
+ docker_root: "test/mocks/prov-mns-provider"
script: |
#!/bin/bash
cd $DOCKER_ROOT
diff --git a/jjb/integration/integration-docker.yaml b/jjb/integration/integration-docker.yaml
index 189d26b..ef37ec7 100644
--- a/jjb/integration/integration-docker.yaml
+++ b/jjb/integration/integration-docker.yaml
@@ -1,48 +1,48 @@
---
- project:
name: integration-docker
- project-name: 'integration'
+ project-name: "integration"
jobs:
- integration-docker-merge
- integration-docker-verify
- project: 'integration'
+ project: "integration"
stream:
- - 'master':
- branch: 'master'
+ - "master":
+ branch: "master"
subproject:
- - 'aai-simulator':
- pom: 'test/mocks/aai-simulator/pom.xml'
- pattern: 'test/mocks/aai-simulator/**'
- mvn-goals: 'mvn clean install -Dcheckstyle.skip'
- - 'sniroemulator':
- pom: 'test/mocks/sniroemulator/pom.xml'
- pattern: 'test/mocks/sniroemulator/**'
- mvn-settings: 'integration-settings'
- files: '**'
- archive-artifacts: ''
+ - "aai-simulator":
+ pom: "test/mocks/aai-simulator/pom.xml"
+ pattern: "test/mocks/aai-simulator/**"
+ mvn-goals: "mvn clean install -Dcheckstyle.skip"
+ - "sniroemulator":
+ pom: "test/mocks/sniroemulator/pom.xml"
+ pattern: "test/mocks/sniroemulator/**"
+ mvn-settings: "integration-settings"
+ files: "**"
+ archive-artifacts: ""
- project:
name: integration-netconf-pnp-simulator
project: integration
stream:
- - 'master':
- branch: 'master'
+ - "master":
+ branch: "master"
# Required by verifier
- mvn-settings: 'integration-settings'
- project-name: 'integration-netconf-pnp-simulator'
+ mvn-settings: "integration-settings"
+ project-name: "integration-netconf-pnp-simulator"
gerrit_trigger_file_paths:
- compare-type: ANT
- pattern: 'test/mocks/netconf-pnp-simulator/engine/**'
- docker-name: 'onap/integration/simulators/netconf-pnp-simulator'
+ pattern: "test/mocks/netconf-pnp-simulator/engine/**"
+ docker-name: "onap/integration/simulators/netconf-pnp-simulator"
docker-root: test/mocks/netconf-pnp-simulator/engine
container-tag-method: yaml-file
post_docker_build_script: |
- #!/bin/bash
- set -eux
- cd "$DOCKER_ROOT"
- # To simplify the references inside tox.ini and tests/settings.py
- docker tag "$CONTAINER_PUSH_REGISTRY/$DOCKER_NAME:$DOCKER_IMAGE_TAG" netconf-pnp-simulator:latest
- tox
+ #!/bin/bash
+ set -eux
+ cd "$DOCKER_ROOT"
+ # To simplify the references inside tox.ini and tests/settings.py
+ docker tag "$CONTAINER_PUSH_REGISTRY/$DOCKER_NAME:$DOCKER_IMAGE_TAG" netconf-pnp-simulator:latest
+ tox
build-node: ubuntu1804-docker-8c-8g
build-timeout: 20
jobs:
@@ -50,29 +50,29 @@
- gerrit-docker-merge
- project:
- name: integration-ran-nssmf-simulator
- project: integration
- stream:
- - 'master':
- branch: 'master'
- # Required by verifier
- mvn-settings: 'integration-settings'
- project-name: 'integration-ran-nssmf-simulator'
- gerrit_trigger_file_paths:
- - compare-type: REG_EXP
- pattern: 'test/mocks/ran-nssmf-simulator/.*'
- docker-name: 'onap/ran-nssmf-simulator'
- docker-root: test/mocks/ran-nssmf-simulator
- container-tag-method: yaml-file
- post_docker_build_script: |
- #!/bin/bash
- set -eux
- cd "$DOCKER_ROOT"
- # To simplify the references inside tox.ini and tests/settings.py
- docker tag "$CONTAINER_PUSH_REGISTRY/$DOCKER_NAME:$DOCKER_IMAGE_TAG" ran-nssmf-simulator:latest
- tox
- build-node: ubuntu1804-docker-8c-8g
- build-timeout: 20
- jobs:
- - gerrit-docker-verify
- - gerrit-docker-merge
+ name: integration-ran-nssmf-simulator
+ project: integration
+ stream:
+ - "master":
+ branch: "master"
+ # Required by verifier
+ mvn-settings: "integration-settings"
+ project-name: "integration-ran-nssmf-simulator"
+ gerrit_trigger_file_paths:
+ - compare-type: REG_EXP
+ pattern: "test/mocks/ran-nssmf-simulator/.*"
+ docker-name: "onap/ran-nssmf-simulator"
+ docker-root: test/mocks/ran-nssmf-simulator
+ container-tag-method: yaml-file
+ post_docker_build_script: |
+ #!/bin/bash
+ set -eux
+ cd "$DOCKER_ROOT"
+ # To simplify the references inside tox.ini and tests/settings.py
+ docker tag "$CONTAINER_PUSH_REGISTRY/$DOCKER_NAME:$DOCKER_IMAGE_TAG" ran-nssmf-simulator:latest
+ tox
+ build-node: ubuntu1804-docker-8c-8g
+ build-timeout: 20
+ jobs:
+ - gerrit-docker-verify
+ - gerrit-docker-merge
diff --git a/jjb/integration/integration-ietf-actn-tools.yaml b/jjb/integration/integration-ietf-actn-tools.yaml
index 991d77f..62d2303 100644
--- a/jjb/integration/integration-ietf-actn-tools.yaml
+++ b/jjb/integration/integration-ietf-actn-tools.yaml
@@ -21,31 +21,30 @@
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'
- - 'js':
- tox-dir: '.'
- tox-envs: 'js'
- pattern: '**/*.js'
+ - "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"
+ - "js":
+ tox-dir: "."
+ tox-envs: "js"
+ pattern: "**/*.js"
stream:
- - 'master':
- branch: 'master'
-
+ - "master":
+ branch: "master"
diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index df48a4c..5e90999 100644
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -4,44 +4,52 @@
parameters:
- string:
name: TESTPLAN
- default: '{test-plan}'
- description: 'General test plan we will run unless stream-specific one is found'
+ default: "{test-plan}"
+ description: "General test plan we will run unless stream-specific one is found"
- parameter:
name: integration-test-options
parameters:
- string:
name: TESTOPTIONS
- default: '{test-options}'
- description: 'Robot command options'
+ default: "{test-options}"
+ description: "Robot command options"
- parameter:
name: html-publisher-dir
parameters:
- string:
name: HTMLDIR
- default: '{html-dir}'
- description: 'Directory location to be used by HTML publisher plugin'
+ default: "{html-dir}"
+ description: "Directory location to be used by HTML publisher plugin"
- parameter:
name: html-publisher-files
parameters:
- string:
name: HTMLFILES
- default: '{html-files}'
- description: 'File name to be used by HTML publisher plugin to produce the report'
+ default: "{html-files}"
+ description: "File name to be used by HTML publisher plugin to produce the report"
- builder:
name: integration-install-robotframework
builders:
- - shell:
- !include-raw:
+ - shell: !include-raw:
- include-raw-integration-install-robotframework.sh
- builder:
+ name: integration-install-robotframework-py3
+ builders:
+ - shell: !include-raw:
+ - include-raw-integration-install-robotframework-py3.sh
+
+- builder:
name: integration-run-test
builders:
- - shell: "${WORKSPACE}/run-csit.sh ${TESTPLAN} ${TESTOPTIONS}"
+ - shell: |
+ git clone https://gerrit.onap.org/r/ci-management /tmp/ci-management
+ cp /tmp/ci-management/jjb/integration/*csit.sh ${WORKSPACE}
+ ${WORKSPACE}/run-csit.sh ${TESTPLAN} ${TESTOPTIONS}
- builder:
name: integration-run-project-test
@@ -82,26 +90,26 @@
name: integration-robot
publishers:
- robot:
- output-path: 'archives'
- output-xml: '**/output.xml'
- report-html: '**/report.html'
- log-html: '**/log.html'
- other-files: ''
- unstable-threshold: '{unstable-if}'
- pass-threshold: '{pass-if}'
+ output-path: "archives"
+ output-xml: "**/output.xml"
+ report-html: "**/report.html"
+ log-html: "**/log.html"
+ other-files: ""
+ unstable-threshold: "{unstable-if}"
+ pass-threshold: "{pass-if}"
only-critical: false
- publisher:
name: integration-project-robot
publishers:
- robot:
- output-path: 'csit/archives'
- output-xml: '**/output.xml'
- report-html: '**/report.html'
- log-html: '**/log.html'
- other-files: ''
- unstable-threshold: '{unstable-if}'
- pass-threshold: '{pass-if}'
+ output-path: "csit/archives"
+ output-xml: "**/output.xml"
+ report-html: "**/report.html"
+ log-html: "**/log.html"
+ other-files: ""
+ unstable-threshold: "{unstable-if}"
+ pass-threshold: "{pass-if}"
only-critical: false
- publisher:
diff --git a/jjb/integration/integration-python-onapsdk.yaml b/jjb/integration/integration-python-onapsdk.yaml
index 12b4c39..5bda56c 100644
--- a/jjb/integration/integration-python-onapsdk.yaml
+++ b/jjb/integration/integration-python-onapsdk.yaml
@@ -4,40 +4,46 @@
project: integration/python-onapsdk
project-name: integration-python-onapsdk
python-version: python3
+ build-node: ubuntu1804-docker-8c-8g
jobs:
- - '{project-name}-{subproject}-python-staging-{stream}'
- - '{project-name}-{subproject}-python-release-{stream}'
+ - integration-linters
stream:
- - 'master':
- branch: 'master'
+ - "master":
+ branch: "master"
subproject:
- - 'python3.7':
- tox-dir: '.'
- tox-envs: 'py37'
- pattern: '**/*.py'
- - 'python3.8':
- tox-dir: '.'
- tox-envs: 'py38'
- pattern: '**/*.py'
- - 'python3.9':
- tox-dir: '.'
- tox-envs: 'py39'
- pattern: '**/*.py'
- - 'python3.10':
- tox-dir: '.'
- tox-envs: 'py310'
- pattern: '**/*.py'
- - 'pylint':
- tox-dir: '.'
- tox-envs: 'pylint'
- pattern: '**/*.py'
- - 'pydocstyle':
- tox-dir: '.'
- tox-envs: 'pydocstyle'
- pattern: '**/*.py'
- stream:
- - 'master':
- branch: 'master'
+ - "python3.7":
+ tox-dir: "."
+ tox-envs: "py37"
+ pattern: "**/*.py"
+ - "python3.8":
+ tox-dir: "."
+ tox-envs: "py38"
+ pattern: "**/*.py"
+ - "python3.9":
+ tox-dir: "."
+ tox-envs: "py39"
+ pattern: "**/*.py"
+ # Disable due to https://jira.linuxfoundation.org/plugins/servlet/desk/portal/2/IT-25247
+ # - 'python3.10':
+ # tox-dir: '.'
+ # tox-envs: 'py310'
+ # pattern: '**/*.py'
+ # - 'python3.11':
+ # tox-dir: '.'
+ # tox-envs: 'py311'
+ # pattern: '**/*.py'
+ - "pylint":
+ tox-dir: "."
+ tox-envs: "pylint"
+ pattern: "**/*.py"
+ - "pydocstyle":
+ tox-dir: "."
+ tox-envs: "pydocstyle"
+ pattern: "**/*.py"
+ - "bandit":
+ tox-dir: "."
+ tox-envs: "bandit"
+ pattern: "**/*.py"
- project:
name: integration-python-onapsdk-project-view
@@ -52,3 +58,26 @@
build-node: centos8-builder-2c-1g
jobs:
- gerrit-info-yaml-verify
+
+- project:
+ name: integration-python-onapsdk-pypi-build
+ project: integration/python-onapsdk
+ project-name: integration-python-onapsdk
+ stream:
+ - "master":
+ branch: "master"
+ jobs:
+ - gerrit-pypi-verify
+
+- project:
+ name: integration-python-onapsdk-pypi-release
+ project: integration/python-onapsdk
+ project-name: integration-python-onapsdk
+ build-node: centos8-builder-2c-1g
+ stream:
+ - "master":
+ branch: "master"
+ jobs:
+ - gerrit-pypi-release-verify
+ - gerrit-pypi-release-merge:
+ pypi-repo: pypi-onapsdk
diff --git a/jjb/integration/integration-seccom.yaml b/jjb/integration/integration-seccom.yaml
index f710ea9..d3f329d 100644
--- a/jjb/integration/integration-seccom.yaml
+++ b/jjb/integration/integration-seccom.yaml
@@ -9,29 +9,29 @@
branch: master
- project:
- name: integration-seccom-linters
- project: integration/seccom
- project-name: integration-seccom
- 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'
- - 'md':
- tox-dir: '.'
- tox-envs: 'md'
- pattern: '**/*.md'
- stream:
- - 'master':
- branch: 'master'
+ name: integration-seccom-linters
+ project: integration/seccom
+ project-name: integration-seccom
+ 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"
+ - "md":
+ tox-dir: "."
+ tox-envs: "md"
+ pattern: "**/*.md"
+ stream:
+ - "master":
+ branch: "master"
diff --git a/jjb/integration/integration-templates-csit.yaml b/jjb/integration/integration-templates-csit.yaml
index 95d8fb3..ae6f9f5 100644
--- a/jjb/integration/integration-templates-csit.yaml
+++ b/jjb/integration/integration-templates-csit.yaml
@@ -1,55 +1,55 @@
---
- job-template:
- name: '{project-name}-{stream}-verify-csit-{functionality}'
- disabled: '{disabled}'
+ name: "{project-name}-{stream}-verify-csit-{functionality}"
+ disabled: false
project-type: freestyle
- build-node: 'ubuntu1804-docker-8c-8g'
- node: '{build-node}'
- recipients: ''
- java-version: 'openjdk11'
+ build-node: "ubuntu1804-docker-8c-8g"
+ node: "{build-node}"
+ recipients: ""
+ java-version: "openjdk11"
python-version: python3
properties:
- lf-infra-properties:
- project: 'integration/csit'
- build-days-to-keep: '{build-days-to-keep}'
+ project: "integration/csit"
+ build-days-to-keep: "{build-days-to-keep}"
parameters:
- infra-parameters:
- project: 'integration/csit'
- branch: '{branch}'
- refspec: 'refs/heads/{branch}'
- artifacts: '{archive-artifacts}'
+ project: "integration/csit"
+ branch: "{branch}"
+ refspec: "refs/heads/{branch}"
+ artifacts: "{archive-artifacts}"
- integration-test-plan:
- test-plan: 'plans/{project-name}/{functionality}'
+ test-plan: "plans/{project-name}/{functionality}"
- integration-test-options:
- test-options: '{robot-options}'
+ test-options: "{robot-options}"
scm:
- gerrit-trigger-scm:
- refspec: '$GERRIT_REFSPEC'
- choosing-strategy: 'gerrit'
- submodule-recursive: '{submodule-recursive}'
+ refspec: "$GERRIT_REFSPEC"
+ choosing-strategy: "gerrit"
+ submodule-recursive: "{submodule-recursive}"
wrappers:
- lf-infra-wrappers:
- build-timeout: '{build-timeout}'
- jenkins-ssh-credential: '{jenkins-ssh-credential}'
+ build-timeout: "{build-timeout}"
+ jenkins-ssh-credential: "{jenkins-ssh-credential}"
triggers:
- gerrit-trigger-patch-submitted:
- server: '{server-name}'
- project: 'integration/csit'
- branch: '{branch}'
- files: '*/{project-name}/**'
+ server: "{server-name}"
+ project: "integration/csit"
+ branch: "{branch}"
+ files: "*/{project-name}/**"
builders:
- lf-update-java-alternatives:
- java-version: '{java-version}'
- - integration-install-robotframework
+ java-version: "{java-version}"
+ - integration-install-robotframework-py3
- inject:
- properties-file: 'env.properties'
+ properties-file: "env.properties"
- integration-run-test
publishers:
@@ -58,65 +58,65 @@
pass-if: 100.0
- lf-infra-publish
- email:
- recipients: '{recipients}'
+ recipients: "{recipients}"
notify-every-unstable-build: false
send-to-individuals: true
- job-template:
- name: '{project-name}-{stream}-csit-{functionality}'
- disabled: '{disabled}'
+ name: "{project-name}-{stream}-csit-{functionality}"
+ disabled: false
project-type: freestyle
- build-node: 'ubuntu1804-docker-8c-8g'
- node: '{build-node}'
- recipients: ''
- java-version: 'openjdk11'
+ build-node: "ubuntu1804-docker-8c-8g"
+ node: "{build-node}"
+ recipients: ""
+ java-version: "openjdk11"
python-version: python3
properties:
- lf-infra-properties:
- project: 'integration/csit'
- build-days-to-keep: '{build-days-to-keep}'
+ project: "integration/csit"
+ build-days-to-keep: "{build-days-to-keep}"
parameters:
- infra-parameters:
- project: 'integration/csit'
- branch: '{branch}'
- refspec: 'refs/heads/{branch}'
- artifacts: '{archive-artifacts}'
+ project: "integration/csit"
+ branch: "{branch}"
+ refspec: "refs/heads/{branch}"
+ artifacts: "{archive-artifacts}"
- integration-test-plan:
- test-plan: 'plans/{project-name}/{functionality}'
+ test-plan: "plans/{project-name}/{functionality}"
- integration-test-options:
- test-options: '{robot-options}'
+ test-options: "{robot-options}"
scm:
- gerrit-trigger-scm:
- refspec: ''
- choosing-strategy: 'default'
- submodule-recursive: '{submodule-recursive}'
+ refspec: ""
+ choosing-strategy: "default"
+ submodule-recursive: "{submodule-recursive}"
wrappers:
- lf-infra-wrappers:
- build-timeout: '{build-timeout}'
- jenkins-ssh-credential: '{jenkins-ssh-credential}'
+ build-timeout: "{build-timeout}"
+ jenkins-ssh-credential: "{jenkins-ssh-credential}"
triggers:
- gerrit-trigger-patch-merged:
- server: '{server-name}'
- project: 'integration/csit'
- branch: '{branch}'
- files: '*/{project-name}/**'
- - timed: '@daily'
+ server: "{server-name}"
+ project: "integration/csit"
+ branch: "{branch}"
+ files: "*/{project-name}/**"
+ - timed: "@daily"
- reverse:
- jobs: '{obj:trigger_jobs}'
+ jobs: "{obj:trigger_jobs}"
builders:
- lf-infra-pre-build
- lf-update-java-alternatives:
- java-version: '{java-version}'
- - integration-install-robotframework
+ java-version: "{java-version}"
+ - integration-install-robotframework-py3
- inject:
- properties-file: 'env.properties'
+ properties-file: "env.properties"
- integration-run-test
publishers:
@@ -125,11 +125,11 @@
pass-if: 100.0
- lf-infra-publish
- email:
- recipients: '{recipients}'
+ recipients: "{recipients}"
notify-every-unstable-build: false
send-to-individuals: true
-- verification_maven_job_boiler_plate: &verification_maven_job_boiler_plate
+- _verification_maven_job_boiler_plate: &verification_maven_job_boiler_plate
name: verification_maven_job_boiler_plate
######################
@@ -141,7 +141,7 @@
build-days-to-keep: 30 # 30 days in case a release takes long to get approved.
build-node: ubuntu1804-docker-8c-8g
build-timeout: 60
- container-public-registry: 'nexus3.onap.org:10001'
+ container-public-registry: "nexus3.onap.org:10001"
git-url: "$GIT_URL/$PROJECT"
github-url: "https://github.com"
maven-versions-plugin: false
@@ -157,7 +157,7 @@
submodule-timeout: 10
submodule-disable: false
- disabled: '{disabled}'
+ disabled: false
archive-artifacts: >
**/*.log
**/hs_err_*.log
@@ -166,8 +166,8 @@
**/target/surefire-reports/*-output.txt
project-type: freestyle
- node: '{build-node}'
- java-version: 'openjdk11'
+ node: "{build-node}"
+ java-version: "openjdk11"
#####################
# Job Configuration #
@@ -175,14 +175,14 @@
concurrent: "{build-concurrent}"
properties:
- lf-infra-properties:
- project: '{project}'
- build-days-to-keep: '{build-days-to-keep}'
+ project: "{project}"
+ build-days-to-keep: "{build-days-to-keep}"
parameters:
- infra-parameters:
- project: '{project}'
- branch: '{branch}'
- refspec: 'refs/heads/{branch}'
- artifacts: '{archive-artifacts}'
+ project: "{project}"
+ branch: "{branch}"
+ refspec: "refs/heads/{branch}"
+ artifacts: "{archive-artifacts}"
- lf-infra-maven-parameters:
mvn-opts: "{mvn-opts}"
mvn-params: "{mvn-params}"
@@ -192,11 +192,11 @@
default: "{archive-artifacts}"
description: Artifacts to archive to the logs server.
- integration-test-options:
- test-options: '{robot-options}'
+ test-options: "{robot-options}"
wrappers:
- lf-infra-wrappers:
- build-timeout: '{build-timeout}'
- jenkins-ssh-credential: '{jenkins-ssh-credential}'
+ build-timeout: "{build-timeout}"
+ jenkins-ssh-credential: "{jenkins-ssh-credential}"
builders:
- lf-infra-pre-build
- lf-jacoco-nojava-workaround
@@ -222,9 +222,9 @@
CONTAINER_PULL_REGISTRY={container-public-registry}
- lf-maven-build:
mvn-goals: "{mvn-goals}"
- - integration-install-robotframework
+ - integration-install-robotframework-py3
- inject:
- properties-file: 'env.properties'
+ properties-file: "env.properties"
- integration-run-project-test
- lf-provide-maven-settings-cleanup
publishers:
@@ -233,7 +233,7 @@
pass-if: 100.0
- lf-infra-publish
- email:
- recipients: '{recipients}'
+ recipients: "{recipients}"
notify-every-unstable-build: false
send-to-individuals: true
@@ -247,21 +247,21 @@
# 3. give a verify vote to the triggering review
#
- name: '{project-name}-review-verification-maven-{stream}'
+ name: "{project-name}-review-verification-maven-{stream}"
<<: *verification_maven_job_boiler_plate
scm:
- gerrit-trigger-scm:
- refspec: '$GERRIT_REFSPEC'
- choosing-strategy: 'gerrit'
- submodule-recursive: '{submodule-recursive}'
+ refspec: "$GERRIT_REFSPEC"
+ choosing-strategy: "gerrit"
+ submodule-recursive: "{submodule-recursive}"
triggers:
- gerrit-trigger-patch-submitted:
- server: '{server-name}'
- project: '{project}'
- branch: '{branch}'
- files: '**'
+ server: "{server-name}"
+ project: "{project}"
+ branch: "{branch}"
+ files: "**"
- job-template:
# Job template for unified merge verification jobs in
@@ -272,18 +272,18 @@
# 2. run CSIT job with the local images
#
- name: '{project-name}-merge-verification-maven-{stream}'
+ name: "{project-name}-merge-verification-maven-{stream}"
<<: *verification_maven_job_boiler_plate
scm:
- gerrit-trigger-scm:
- refspec: ''
- choosing-strategy: 'default'
- submodule-recursive: '{submodule-recursive}'
+ refspec: ""
+ choosing-strategy: "default"
+ submodule-recursive: "{submodule-recursive}"
triggers:
- gerrit-trigger-patch-merged:
- server: '{server-name}'
- project: '{project}'
- branch: '{branch}'
- files: '**'
+ server: "{server-name}"
+ project: "{project}"
+ branch: "{branch}"
+ files: "**"
diff --git a/jjb/integration/integration-templates-docker.yaml b/jjb/integration/integration-templates-docker.yaml
index a0fafde..2787f68 100644
--- a/jjb/integration/integration-templates-docker.yaml
+++ b/jjb/integration/integration-templates-docker.yaml
@@ -1,58 +1,58 @@
---
- job-template:
- name: '{project-name}-{stream}-{subproject}-docker-merge'
+ name: "{project-name}-{stream}-{subproject}-docker-merge"
id: integration-docker-merge
project-type: freestyle
- node: 'ubuntu1804-docker-8c-8g'
- docker-image-name: ''
- mvn-goals: 'clean package docker:build docker:push'
+ node: "ubuntu1804-docker-8c-8g"
+ docker-image-name: ""
+ mvn-goals: "clean package docker:build docker:push"
properties:
- infra-properties:
- build-days-to-keep: '{build-days-to-keep}'
+ build-days-to-keep: "{build-days-to-keep}"
parameters:
- infra-parameters:
- project: '{project}'
- branch: '{branch}'
- refspec: 'refs/heads/{branch}'
- artifacts: '{archive-artifacts}'
+ project: "{project}"
+ branch: "{branch}"
+ refspec: "refs/heads/{branch}"
+ artifacts: "{archive-artifacts}"
- maven-exec:
- maven-version: '{maven-version}'
+ maven-version: "{maven-version}"
- docker-image-name:
- docker-image-name: '{docker-image-name}'
+ docker-image-name: "{docker-image-name}"
scm:
- gerrit-trigger-scm:
- refspec: ''
- choosing-strategy: 'default'
- submodule-recursive: '{submodule-recursive}'
+ refspec: ""
+ choosing-strategy: "default"
+ submodule-recursive: "{submodule-recursive}"
wrappers:
- infra-wrappers:
- build-timeout: '{build-timeout}'
+ build-timeout: "{build-timeout}"
triggers:
- gerrit-trigger-patch-merged:
- server: '{server-name}'
- project: '{project}'
- branch: '{branch}'
- files: '{pattern}'
+ server: "{server-name}"
+ project: "{project}"
+ branch: "{branch}"
+ files: "{pattern}"
builders:
- provide-maven-settings:
- global-settings-file: 'global-settings'
- settings-file: '{mvn-settings}'
+ global-settings-file: "global-settings"
+ settings-file: "{mvn-settings}"
- docker-login
- maven-target:
- maven-version: '{maven-version}'
- pom: '{pom}'
- goals: '{mvn-goals}'
- settings: '{mvn-settings}'
+ maven-version: "{maven-version}"
+ pom: "{pom}"
+ goals: "{mvn-goals}"
+ settings: "{mvn-settings}"
settings-type: cfp
- global-settings: 'global-settings'
+ global-settings: "global-settings"
global-settings-type: cfp
properties:
- docker.pull.registry=nexus3.onap.org:10001
@@ -62,113 +62,113 @@
- lf-infra-publish
- job-template:
- name: '{project-name}-{stream}-{subproject}-docker-verify'
+ name: "{project-name}-{stream}-{subproject}-docker-verify"
id: integration-docker-verify
project-type: freestyle
- node: 'ubuntu1804-docker-8c-8g'
- docker-image-name: ''
- mvn-goals: 'clean package docker:build'
- post-docker-verify-script: ''
+ node: "ubuntu1804-docker-8c-8g"
+ docker-image-name: ""
+ mvn-goals: "clean package docker:build"
+ post-docker-verify-script: ""
properties:
- infra-properties:
- build-days-to-keep: '{build-days-to-keep}'
+ build-days-to-keep: "{build-days-to-keep}"
parameters:
- infra-parameters:
- project: '{project}'
- branch: '{branch}'
- refspec: 'refs/heads/{branch}'
- artifacts: '{archive-artifacts}'
+ project: "{project}"
+ branch: "{branch}"
+ refspec: "refs/heads/{branch}"
+ artifacts: "{archive-artifacts}"
- maven-exec:
- maven-version: '{maven-version}'
+ maven-version: "{maven-version}"
- docker-image-name:
- docker-image-name: '{docker-image-name}'
+ docker-image-name: "{docker-image-name}"
scm:
- gerrit-trigger-scm:
- refspec: '$GERRIT_REFSPEC'
- choosing-strategy: 'gerrit'
- submodule-recursive: '{submodule-recursive}'
+ refspec: "$GERRIT_REFSPEC"
+ choosing-strategy: "gerrit"
+ submodule-recursive: "{submodule-recursive}"
wrappers:
- infra-wrappers:
- build-timeout: '{build-timeout}'
+ build-timeout: "{build-timeout}"
triggers:
- gerrit-trigger-patch-submitted:
- server: '{server-name}'
- project: '{project}'
- branch: '{branch}'
- files: '{pattern}'
+ server: "{server-name}"
+ project: "{project}"
+ branch: "{branch}"
+ files: "{pattern}"
builders:
- provide-maven-settings:
- global-settings-file: 'global-settings'
- settings-file: '{mvn-settings}'
+ global-settings-file: "global-settings"
+ settings-file: "{mvn-settings}"
- docker-login
- maven-target:
- maven-version: '{maven-version}'
- pom: '{pom}'
- goals: '{mvn-goals}'
- settings: '{mvn-settings}'
+ maven-version: "{maven-version}"
+ pom: "{pom}"
+ goals: "{mvn-goals}"
+ settings: "{mvn-settings}"
settings-type: cfp
- global-settings: 'global-settings'
+ global-settings: "global-settings"
global-settings-type: cfp
properties:
- docker.pull.registry=nexus3.onap.org:10001
- docker.push.registry=nexus3.onap.org:10003
- - shell: '{post-docker-verify-script}'
+ - shell: "{post-docker-verify-script}"
publishers:
- lf-infra-publish
- job-template:
- name: '{project-name}-{stream}-{subproject}-docker-compose-verify'
+ name: "{project-name}-{stream}-{subproject}-docker-compose-verify"
id: integration-docker-compose-verify
project-type: freestyle
- description: 'This job validates Docker Compose based projects'
- node: 'ubuntu1804-docker-8c-8g'
- docker_root: '$WORKSPACE'
- post_script: ''
- netconf_sim_service_name: ''
+ description: "This job validates Docker Compose based projects"
+ node: "ubuntu1804-docker-8c-8g"
+ docker_root: "$WORKSPACE"
+ post_script: ""
+ netconf_sim_service_name: ""
parameters:
- lf-infra-parameters:
- project: '{project}'
- stream: '{stream}'
- branch: '{branch}'
+ project: "{project}"
+ stream: "{stream}"
+ branch: "{branch}"
properties:
- infra-properties:
- build-days-to-keep: '{build-days-to-keep}'
+ build-days-to-keep: "{build-days-to-keep}"
scm:
- gerrit-trigger-scm:
- refspec: '$GERRIT_REFSPEC'
- choosing-strategy: 'gerrit'
- submodule-recursive: '{submodule-recursive}'
+ refspec: "$GERRIT_REFSPEC"
+ choosing-strategy: "gerrit"
+ submodule-recursive: "{submodule-recursive}"
wrappers:
- infra-wrappers:
- build-timeout: '{build-timeout}'
+ build-timeout: "{build-timeout}"
triggers:
- gerrit-trigger-patch-submitted:
- server: '{server-name}'
- project: '{project}'
- branch: '{branch}'
- files: '{pattern}'
+ server: "{server-name}"
+ project: "{project}"
+ branch: "{branch}"
+ files: "{pattern}"
builders:
- inject:
properties-content: |
DOCKER_ROOT={docker_root}
NETCONF_SIM_SERVICE_NAME={netconf_sim_service_name}
- - shell: '{script}'
- - shell: '{post_script}'
+ - shell: "{script}"
+ - shell: "{post_script}"
publishers:
- integration-docker-compose-logs
diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 77be42b..9265ee2 100644
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -5,41 +5,41 @@
# The purpose of this job template is to run:
# vagrant validate
- name: '{project-name}-{stream}-verify-vagrantfile'
+ name: "{project-name}-{stream}-verify-vagrantfile"
project-type: freestyle
- description: 'Job intended for validating vagrantfiles'
+ description: "Job intended for validating vagrantfiles"
node: ubuntu1804-builder-4c-4g
parameters:
- lf-infra-parameters:
- project: '{project}'
- stream: '{stream}'
- branch: '{branch}'
+ project: "{project}"
+ stream: "{stream}"
+ branch: "{branch}"
properties:
- infra-properties:
- build-days-to-keep: '{build-days-to-keep}'
+ build-days-to-keep: "{build-days-to-keep}"
scm:
- gerrit-trigger-scm:
- refspec: '$GERRIT_REFSPEC'
- choosing-strategy: 'gerrit'
- submodule-recursive: '{submodule-recursive}'
+ refspec: "$GERRIT_REFSPEC"
+ choosing-strategy: "gerrit"
+ submodule-recursive: "{submodule-recursive}"
wrappers:
- infra-wrappers:
- build-timeout: '{build-timeout}'
+ build-timeout: "{build-timeout}"
triggers:
- gerrit-trigger-patch-submitted:
- server: '{server-name}'
- project: '{project}'
- branch: '{branch}'
- files: '**/Vagrantfile'
+ server: "{server-name}"
+ project: "{project}"
+ branch: "{branch}"
+ files: "**/Vagrantfile"
builders:
- integration-install-vagrant
- - shell: !include-raw-escape: 'vagrantfile-verify.sh'
+ - shell: !include-raw-escape: "vagrantfile-verify.sh"
publishers:
- lf-infra-publish
@@ -53,84 +53,84 @@
# tox-dir: Directory containing the project's tox.ini
# pattern: List of file patterns to scan
- name: '{project-name}-{stream}-{subproject}-lint'
+ name: "{project-name}-{stream}-{subproject}-lint"
id: integration-linters
project-type: freestyle
- description: 'Job intended for running linters with Tox and Coala'
- build-node: ubuntu1804-builder-4c-4g
- node: '{build-node}'
+ description: "Job intended for running linters with Tox and Coala"
+ build-node: centos8-builder-2c-1g
+ node: "{build-node}"
parameters:
- lf-infra-parameters:
- project: '{project}'
- stream: '{stream}'
- branch: '{branch}'
+ project: "{project}"
+ stream: "{stream}"
+ branch: "{branch}"
- lf-infra-tox-parameters:
- tox-dir: '{tox-dir}'
- tox-envs: '{tox-envs}'
+ tox-dir: "{tox-dir}"
+ tox-envs: "{tox-envs}"
properties:
- infra-properties:
- build-days-to-keep: '{build-days-to-keep}'
+ build-days-to-keep: "{build-days-to-keep}"
scm:
- gerrit-trigger-scm:
- refspec: '$GERRIT_REFSPEC'
- choosing-strategy: 'gerrit'
- submodule-recursive: '{submodule-recursive}'
+ refspec: "$GERRIT_REFSPEC"
+ choosing-strategy: "gerrit"
+ submodule-recursive: "{submodule-recursive}"
wrappers:
- infra-wrappers:
- build-timeout: '{build-timeout}'
+ build-timeout: "{build-timeout}"
triggers:
- gerrit-trigger-patch-submitted:
- server: '{server-name}'
- project: '{project}'
- branch: '{branch}'
- files: '{pattern}'
+ server: "{server-name}"
+ project: "{project}"
+ branch: "{branch}"
+ files: "{pattern}"
builders:
- lf-infra-tox-install:
- python-version: '{python-version}'
+ python-version: "{python-version}"
- lf-infra-tox-run:
- parallel: 'false'
+ parallel: "false"
publishers:
- lf-infra-publish
- job-template:
<<: *tox_verify_boilerplate
- name: '{project-name}-{stream}-{subproject}-tox-verify'
+ name: "{project-name}-{stream}-{subproject}-tox-verify"
id: integration-tox-verify
- description: 'Job intended for running tox'
+ description: "Job intended for running tox"
- job-template:
<<: *tox_verify_boilerplate
- name: '{project-name}-{stream}-{subproject}-terraform-verify'
+ name: "{project-name}-{stream}-{subproject}-terraform-verify"
terraform-version: 0.13.2
terragrunt-version: 0.24.1
python-version: python3
id: integration-terraform-verify
- description: 'Job intended for validating terraform modules'
+ description: "Job intended for validating terraform modules"
parameters:
- lf-infra-parameters:
- project: '{project}'
- stream: '{stream}'
- branch: '{branch}'
+ project: "{project}"
+ stream: "{stream}"
+ branch: "{branch}"
- lf-infra-tox-parameters:
- tox-dir: '{tox-dir}'
- tox-envs: '{tox-envs}'
+ tox-dir: "{tox-dir}"
+ tox-envs: "{tox-envs}"
- integration-terraform-version:
- terraform-version: '{terraform-version}'
+ terraform-version: "{terraform-version}"
- integration-terragrunt-version:
- terragrunt-version: '{terragrunt-version}'
+ terragrunt-version: "{terragrunt-version}"
builders:
- integration-install-terraform
- integration-install-terragrunt
- lf-infra-tox-install:
- python-version: '{python-version}'
+ python-version: "{python-version}"
- lf-infra-tox-run:
- parallel: 'false'
+ parallel: "false"
diff --git a/jjb/integration/integration.yaml b/jjb/integration/integration.yaml
index cb8286d..9d289a4 100644
--- a/jjb/integration/integration.yaml
+++ b/jjb/integration/integration.yaml
@@ -19,97 +19,97 @@
project-name: integration
project: integration
stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'integration-settings'
- build-node: 'ubuntu1804-builder-4c-4g'
+ - "master":
+ branch: "master"
+ mvn-settings: "integration-settings"
+ build-node: "ubuntu1804-builder-4c-4g"
subproject:
- - 'test-vcpe':
- path: 'test/vcpe'
- pattern: 'test/vcpe/**'
- - 'ran-nssmf-simulator':
- path: 'test/mocks/ran-nssmf-simulator'
- pattern: 'test/mocks/ran-nssmf-simulator/**'
+ - "test-vcpe":
+ path: "test/vcpe"
+ pattern: "test/vcpe/**"
+ - "ran-nssmf-simulator":
+ path: "test/mocks/ran-nssmf-simulator"
+ pattern: "test/mocks/ran-nssmf-simulator/**"
jobs:
- - '{project-name}-{stream}-{subproject}-verify-python'
+ - "{project-name}-{stream}-{subproject}-verify-python"
- project:
name: integration-verify-vagrantfile
- project-name: 'integration'
- project: 'integration'
+ project-name: "integration"
+ project: "integration"
stream:
- - 'master':
- branch: 'master'
+ - "master":
+ branch: "master"
jobs:
- - '{project-name}-{stream}-verify-vagrantfile'
+ - "{project-name}-{stream}-verify-vagrantfile"
- project:
name: integration-verify-golang
- project-name: 'integration'
- project: 'integration'
- golangver: 'golang114'
- mvn-settings: 'integration-settings'
- archive-artifacts: ''
+ project-name: "integration"
+ project: "integration"
+ golangver: "golang114"
+ mvn-settings: "integration-settings"
+ archive-artifacts: ""
jobs:
- - '{project-name}-{stream}-{subproject}-verify-golang'
+ - "{project-name}-{stream}-{subproject}-verify-golang"
subproject:
- - 'test-security-k8s':
- path: 'test/security/k8s'
- pattern: '{path}/**'
+ - "test-security-k8s":
+ path: "test/security/k8s"
+ pattern: "{path}/**"
build-node: ubuntu1804-builder-4c-4g
script: |
- #!/bin/bash
- set -ex # Fail build if any setup step fails
- cd $WORKSPACE/{path}
- make test
- - 'test-security-sslendpoints':
- path: 'test/security/sslendpoints'
- pattern: '{path}/**'
+ #!/bin/bash
+ set -ex # Fail build if any setup step fails
+ cd $WORKSPACE/{path}
+ make test
+ - "test-security-sslendpoints":
+ path: "test/security/sslendpoints"
+ pattern: "{path}/**"
build-node: ubuntu1804-docker-8c-8g
script: |
- #!/bin/bash
- set -ex # Fail build if any setup step fails
- cd $WORKSPACE/{path}
- rm -rf $WORKSPACE/{path}/bin
- make docker-build
- make test
- make clean
+ #!/bin/bash
+ set -ex # Fail build if any setup step fails
+ cd $WORKSPACE/{path}
+ rm -rf $WORKSPACE/{path}/bin
+ make docker-build
+ make test
+ make clean
stream:
- - 'master':
- branch: 'master'
+ - "master":
+ branch: "master"
- project:
name: integration-linters
- project: 'integration'
- project-name: 'integration'
+ project: "integration"
+ project-name: "integration"
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'
- - 'rst':
- tox-dir: '.'
- tox-envs: 'rst'
- pattern: '**/*.rst'
- - 'md':
- tox-dir: '.'
- tox-envs: 'md'
- pattern: '**/*.md'
+ - "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"
+ - "rst":
+ tox-dir: "."
+ tox-envs: "rst"
+ pattern: "**/*.rst"
+ - "md":
+ tox-dir: "."
+ tox-envs: "md"
+ pattern: "**/*.md"
stream:
- - 'master':
- branch: 'master'
+ - "master":
+ branch: "master"
diff --git a/jjb/integration/prepare-csit.sh b/jjb/integration/prepare-csit.sh
new file mode 100644
index 0000000..dc732c6
--- /dev/null
+++ b/jjb/integration/prepare-csit.sh
@@ -0,0 +1,123 @@
+#!/bin/bash -x
+#
+# Copyright 2019-2021 Samsung Electronics Co., Ltd.
+# Modifications Copyright (C) 2021 Pantheon.tech
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# This script installs common libraries required by CSIT tests
+#
+
+echo "---> prepare-csit.sh"
+
+set -exo pipefail
+
+ROBOT_INSTALLER='include-raw-integration-install-robotframework-py3.sh'
+
+# Allows testing for root permissions
+REQ_USER=$(id -un)
+
+if ! (which git > /dev/null 2>&1); then
+ echo "GIT binary not found in current PATH"
+ # Add missing package to prevent script/job failures
+ if (grep Ubuntu /etc/os-release > /dev/null 2>&1) || \
+ (grep Debian /etc/os-release > /dev/null 2>&1); then
+ echo "Installing package dependency for Ubuntu/Debian"
+ if [[ "${REQ_USER}" == 'root' ]]; then
+ apt-get update
+ apt-get install -y git
+ else
+ sudo apt-get update
+ sudo apt-get install -y git
+ fi
+ elif (grep RedHat /etc/os-release > /dev/null 2>&1) || \
+ (grep CentOS /etc/os-release > /dev/null 2>&1); then
+ echo "Installing package dependency for CentOS/RedHat"
+ if [[ "${REQ_USER}" == 'root' ]]; then
+ yum install -y git
+ else
+ sudo yum install -y git
+ fi
+ else
+ echo "Warning: unmatched OS/distribution"
+ echo "Missing software will not be installed"
+ fi
+fi
+
+if [[ -z "${WORKSPACE}" ]]; then
+ if (git rev-parse --show-toplevel > /dev/null 2>&1); then
+ WORKSPACE=$(git rev-parse --show-toplevel)
+ export WORKSPACE
+ else
+ WORKSPACE=$(pwd)
+ export WORKSPACE
+ fi
+fi
+
+# shellcheck disable=SC2034
+TESTPLANDIR="${WORKSPACE}/${TESTPLAN}"
+
+# Python version should match that used to setup
+# robot-framework in other jobs/stages
+# Use pyenv for selecting the python version
+if [[ -d "/opt/pyenv" ]]; then
+ echo "Setup pyenv:"
+ export PYENV_ROOT="/opt/pyenv"
+ export PATH="$PYENV_ROOT/bin:$PATH"
+ pyenv versions
+ if command -v pyenv 1>/dev/null 2>&1; then
+ eval "$(pyenv init - --no-rehash)"
+ # Choose the latest numeric Python version from installed list
+ version=$(pyenv versions --bare | sed '/^[^0-9]/d' \
+ | sort -V | tail -n 1)
+ pyenv local "${version}"
+ fi
+fi
+
+# Assume that if ROBOT3_VENV is set, virtualenv
+# with system site packages can be activated
+if [[ -f "${WORKSPACE}/env.properties" ]]; then
+ source "${WORKSPACE}/env.properties"
+elif [[ -f /tmp/env.properties ]]; then
+ source /tmp/env.properties
+fi
+
+if [[ -f "${ROBOT3_VENV}/bin/activate" ]]; then
+ source "${ROBOT3_VENV}/bin/activate"
+else
+ # Robot framework was not found
+ # Clone/update ci-management repository and invoke install script
+ if [[ ! -d /tmp/ci-management ]]; then
+ git clone "https://gerrit.onap.org/r/ci-management" \
+ /tmp/ci-management
+ else
+ git pull /tmp/ci-management
+ fi
+ # shellcheck disable=SC1090
+ source "/tmp/ci-management/jjb/integration/${ROBOT_INSTALLER}"
+fi
+
+# install eteutils
+mkdir -p "${ROBOT3_VENV}/src/onap"
+rm -rf "${ROBOT3_VENV}/src/onap/testsuite"
+# Source from the Nexus repository
+python3 -m pip install --upgrade \
+ --extra-index-url="https://nexus3.onap.org/repository/PyPi.staging/simple" \
+ 'robotframework-onap==11.0.0.dev17' \
+ --pre
+
+echo "Versioning information:"
+python3 --version
+pip freeze
+python3 -m robot.run --version || :
+
diff --git a/jjb/integration/run-csit.sh b/jjb/integration/run-csit.sh
new file mode 100644
index 0000000..4ee5d75
--- /dev/null
+++ b/jjb/integration/run-csit.sh
@@ -0,0 +1,203 @@
+#!/bin/bash -x
+#
+# Copyright 2016-2017 Huawei Technologies Co., Ltd.
+# Modification Copyright 2019 Samsung Electronics Co., Ltd.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# $1 project/functionality {TESTPLAN}
+# $2 robot options {TESTOPTIONS}
+
+echo "---> run-csit.sh"
+
+#
+# functions
+#
+
+function on_exit {
+ rc=$?
+ if [[ ${WORKSPACE} ]]; then
+ if [[ ${WORKDIR} ]]; then
+ rsync -av "$WORKDIR/" "$WORKSPACE/archives/$TESTPLAN"
+ fi
+ # Record list of active docker containers
+ docker ps --format "{{.Image}}" > "$WORKSPACE/archives/$TESTPLAN/_docker-images.log"
+
+ # show memory consumption after all docker instances initialized
+ docker_stats | tee "$WORKSPACE/archives/$TESTPLAN/_sysinfo-2-after-robot.txt"
+ fi
+ # Run teardown script plan if it exists
+ cd "${TESTPLANDIR}"
+ TEARDOWN="${TESTPLANDIR}/teardown.sh"
+ if [ -f "${TEARDOWN}" ]; then
+ echo "Running teardown script ${TEARDOWN}"
+ source_safely "${TEARDOWN}"
+ fi
+ # TODO: do something with the output
+ exit $rc
+}
+# ensure that teardown and other finalizing steps are always executed
+trap on_exit EXIT
+
+function docker_stats {
+ #General memory details
+ echo "> top -bn1 | head -3"
+ top -bn1 | head -3
+ echo
+
+ echo "> free -h"
+ free -h
+ echo
+
+ #Memory details per Docker
+ echo "> docker ps"
+ docker ps
+ echo
+
+ echo "> docker stats --no-stream"
+ docker stats --no-stream
+ echo
+}
+
+# save current set options
+function save_set {
+ RUN_CSIT_SAVE_SET="$-"
+ RUN_CSIT_SHELLOPTS="$SHELLOPTS"
+}
+
+# load the saved set options
+function load_set {
+ _setopts="$-"
+
+ # bash shellopts
+ for i in $(echo "$SHELLOPTS" | tr ':' ' ') ; do
+ set +o ${i}
+ done
+ for i in $(echo "$RUN_CSIT_SHELLOPTS" | tr ':' ' ') ; do
+ set -o ${i}
+ done
+
+ # other options
+ for i in $(echo "$_setopts" | sed 's/./& /g') ; do
+ set +${i}
+ done
+ set -${RUN_CSIT_SAVE_SET}
+}
+
+# set options for quick bailout when error
+function harden_set {
+ set -xeo pipefail
+ set +u # enabled it would probably fail too many often
+}
+
+# relax set options so the sourced file will not fail
+# the responsibility is shifted to the sourced file...
+function relax_set {
+ set +e
+ set +o pipefail
+}
+
+# wrapper for sourcing a file
+function source_safely {
+ [ -z "$1" ] && return 1
+ relax_set
+ . "$1"
+ load_set
+}
+
+#
+# main
+#
+
+# set and save options for quick failure
+harden_set && save_set
+
+if [ $# -eq 0 ]; then
+ echo
+ echo "Usage: $0 plans/<project>/<functionality> [<robot-options>]"
+ echo
+ echo " <project>, <functionality>, <robot-options>: "
+ echo " The same values as for the '{project}-csit-{functionality}' JJB job template."
+ echo
+ exit 1
+fi
+
+if [ -z "$WORKSPACE" ]; then
+ export WORKSPACE=$(git rev-parse --show-toplevel)
+fi
+
+if [ -f "${WORKSPACE}/${1}/testplan.txt" ]; then
+ export TESTPLAN="${1}"
+else
+ echo "testplan not found: ${WORKSPACE}/${TESTPLAN}/testplan.txt"
+ exit 2
+fi
+
+export TESTOPTIONS="${2}"
+
+rm -rf "$WORKSPACE/archives/$TESTPLAN"
+mkdir -p "$WORKSPACE/archives/$TESTPLAN"
+
+TESTPLANDIR="${WORKSPACE}/${TESTPLAN}"
+
+# Run installation of required libraries
+source_safely "${WORKSPACE}/prepare-csit.sh"
+
+# Activate the virtualenv containing all the required libraries installed by prepare-csit.sh
+source_safely "${ROBOT3_VENV}/bin/activate"
+
+WORKDIR=$(mktemp -d --suffix=-robot-workdir)
+cd "${WORKDIR}"
+
+# Add csit scripts to PATH
+export PATH="${PATH}:${WORKSPACE}/docker/scripts:${WORKSPACE}/scripts:${ROBOT3_VENV}/bin"
+export SCRIPTS="${WORKSPACE}/scripts"
+export ROBOT_VARIABLES=
+
+# Sign in to nexus3 docker repo
+docker login -u docker -p docker nexus3.onap.org:10001
+
+# Run setup script plan if it exists
+cd "${TESTPLANDIR}"
+SETUP="${TESTPLANDIR}/setup.sh"
+if [ -f "${SETUP}" ]; then
+ echo "Running setup script ${SETUP}"
+ source_safely "${SETUP}"
+fi
+
+# show memory consumption after all docker instances initialized
+docker_stats | tee "$WORKSPACE/archives/$TESTPLAN/_sysinfo-1-after-setup.txt"
+
+# Run test plan
+cd "$WORKDIR"
+echo "Reading the testplan:"
+grep -E -v '(^[[:space:]]*#|^[[:space:]]*$)' "${TESTPLANDIR}/testplan.txt" |\
+ sed "s|^|${WORKSPACE}/tests/|" > testplan.txt
+cat testplan.txt
+SUITES=$( xargs -a testplan.txt )
+
+echo "Versioning information:"
+python3 --version
+pip3 freeze
+python3 -m robot.run --version || :
+
+echo ROBOT_VARIABLES="${ROBOT_VARIABLES}"
+echo "Starting Robot test suites ${SUITES} ..."
+relax_set
+# Do NOT quote variables below, it breaks testing
+python3 -m robot.run -N ${TESTPLAN} -v WORKSPACE:/tmp ${ROBOT_VARIABLES} ${TESTOPTIONS} ${SUITES}
+RESULT=$?
+load_set
+echo "RESULT: $RESULT"
+# Note that the final steps are done in on_exit function after this exit!
+exit $RESULT
diff --git a/jjb/integration/simulators/integration-5G-core-nf-simulator.yaml b/jjb/integration/simulators/integration-5G-core-nf-simulator.yaml
index ed7c32e..527cead 100644
--- a/jjb/integration/simulators/integration-5G-core-nf-simulator.yaml
+++ b/jjb/integration/simulators/integration-5G-core-nf-simulator.yaml
@@ -13,27 +13,27 @@
project-name: integration-5G-core-nf-simulator
project: integration/simulators/5G-core-nf-simulator
stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'integration-simulators-5G-core-nf-simulator-settings'
- archive-artifacts: ''
+ - "master":
+ branch: "master"
+ mvn-settings: "integration-simulators-5G-core-nf-simulator-settings"
+ archive-artifacts: ""
build-node: ubuntu1804-docker-8c-8g
subproject:
- - 'AMF':
- path: 'coresim/AMF/'
- pattern: 'coresim/AMF/**'
- pom: 'coresim/AMF/pom.xml'
- - 'SMF':
- path: 'coresim/SMF/'
- pattern: 'coresim/SMF/**'
- pom: 'coresim/SMF/pom.xml'
- - 'UPF':
- path: 'coresim/UPF/'
- pattern: 'coresim/UPF/**'
- pom: 'coresim/UPF/pom.xml'
+ - "AMF":
+ path: "coresim/AMF/"
+ pattern: "coresim/AMF/**"
+ pom: "coresim/AMF/pom.xml"
+ - "SMF":
+ path: "coresim/SMF/"
+ pattern: "coresim/SMF/**"
+ pom: "coresim/SMF/pom.xml"
+ - "UPF":
+ path: "coresim/UPF/"
+ pattern: "coresim/UPF/**"
+ pom: "coresim/UPF/pom.xml"
jobs:
- - '{project-name}-{stream}-{subproject}-verify-java':
- mvn-goals: 'clean install'
+ - "{project-name}-{stream}-{subproject}-verify-java":
+ mvn-goals: "clean install"
- project:
name: integration-5G-core-nf-simulator-linters
@@ -43,26 +43,26 @@
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'
- - 'md':
- tox-dir: '.'
- tox-envs: 'md'
- pattern: '**/*.md'
- - 'python':
- tox-dir: '.'
- tox-envs: 'py'
- pattern: '**/*.py'
+ - "yaml":
+ tox-dir: "."
+ tox-envs: "yaml"
+ pattern: "**/*.yaml"
+ - "yml":
+ tox-dir: "."
+ tox-envs: "yaml"
+ pattern: "**/*.yml"
+ - "json":
+ tox-dir: "."
+ tox-envs: "json"
+ pattern: "**/*.json"
+ - "md":
+ tox-dir: "."
+ tox-envs: "md"
+ pattern: "**/*.md"
+ - "python":
+ tox-dir: "."
+ tox-envs: "py"
+ pattern: "**/*.py"
stream:
- - 'master':
- branch: 'master'
+ - "master":
+ branch: "master"
diff --git a/jjb/integration/simulators/integration-A1-policy-enforcement-simulator.yaml b/jjb/integration/simulators/integration-A1-policy-enforcement-simulator.yaml
index 17d3d9b..7fe5733 100644
--- a/jjb/integration/simulators/integration-A1-policy-enforcement-simulator.yaml
+++ b/jjb/integration/simulators/integration-A1-policy-enforcement-simulator.yaml
@@ -1,5 +1,4 @@
---
-
- project:
name: integration-simulators-A1-policy-enforcement-simulator-info
project: integration/simulators/A1-policy-enforcement-simulator
@@ -14,15 +13,15 @@
project-name: integration-simulators-A1-policy-enforcement-simulator
java-version: openjdk11
stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'integration-simulators-A1-policy-enforcement-simulator-settings'
- files: '**'
- archive-artifacts: ''
+ - "master":
+ branch: "master"
+ mvn-settings: "integration-simulators-A1-policy-enforcement-simulator-settings"
+ files: "**"
+ archive-artifacts: ""
build-node: ubuntu1804-docker-8c-8g
jobs:
- - '{project-name}-{stream}-verify-java':
- mvn-goals: 'clean install'
+ - "{project-name}-{stream}-verify-java":
+ mvn-goals: "clean install"
- project:
name: integration-simulators-A1-policy-enforcement-simulator-linters
@@ -32,26 +31,26 @@
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'
+ - "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'
+ - "master":
+ branch: "master"
diff --git a/jjb/integration/simulators/integration-core-nssmf-simulator.yaml b/jjb/integration/simulators/integration-core-nssmf-simulator.yaml
index 299fc1e..fe5d97a 100644
--- a/jjb/integration/simulators/integration-core-nssmf-simulator.yaml
+++ b/jjb/integration/simulators/integration-core-nssmf-simulator.yaml
@@ -12,30 +12,30 @@
project: integration/simulators/core-nssmf-simulator
project-name: integration-simulators-core-nssmf-simulator
stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'integration-simulators-core-nssmf-simulator-settings'
- files: '**'
+ - "master":
+ branch: "master"
+ mvn-settings: "integration-simulators-core-nssmf-simulator-settings"
+ files: "**"
maven-deploy-properties: |
- deployAtEnd=true
- archive-artifacts: ''
+ deployAtEnd=true
+ archive-artifacts: ""
build-node: ubuntu1804-docker-8c-8g
jobs:
- - '{project-name}-{stream}-verify-java':
- mvn-goals: 'clean install'
- - '{project-name}-{stream}-merge-java':
- mvn-goals: 'clean deploy'
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
- - gerrit-maven-docker-stage:
- build-node: centos7-docker-8c-8g
- maven-versions-plugin: true
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
- mvn-goals: 'clean install'
- mvn-params: '-P docker'
- - gerrit-maven-stage:
- sign-artifacts: true
- build-node: centos7-docker-8c-8g
- maven-versions-plugin: true
- mvn-goals: 'clean deploy'
+ - "{project-name}-{stream}-verify-java":
+ mvn-goals: "clean install"
+ - "{project-name}-{stream}-merge-java":
+ mvn-goals: "clean deploy"
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
+ - gerrit-maven-docker-stage:
+ build-node: centos8-docker-8c-8g
+ maven-versions-plugin: true
+ container-public-registry: "nexus3.onap.org:10001"
+ container-staging-registry: "nexus3.onap.org:10003"
+ mvn-goals: "clean deploy"
+ mvn-params: "-P docker"
+ - gerrit-maven-stage:
+ sign-artifacts: true
+ build-node: centos8-docker-8c-8g
+ maven-versions-plugin: true
+ mvn-goals: "clean deploy"
diff --git a/jjb/integration/simulators/integration-onap-components-simulators.yaml b/jjb/integration/simulators/integration-onap-components-simulators.yaml
new file mode 100644
index 0000000..dc82c33
--- /dev/null
+++ b/jjb/integration/simulators/integration-onap-components-simulators.yaml
@@ -0,0 +1,86 @@
+---
+- project:
+ name: "integration-onap-components-simulators-docker"
+ jobs:
+ - gerrit-docker-verify:
+ project-name: "integration-onap-component-simulators-aai"
+ docker-root: ./mock-aai
+ docker-name: "onap/onap-component-mock-aai"
+ - gerrit-docker-merge:
+ project-name: "integration-onap-component-simulators-aai"
+ docker-root: ./mock-aai
+ docker-name: "onap/onap-component-mock-aai"
+ - gerrit-docker-verify:
+ project-name: "integration-onap-component-simulators-cds"
+ docker-root: ./mock-cds
+ docker-name: "onap/onap-component-mock-cds"
+ - gerrit-docker-merge:
+ project-name: "integration-onap-component-simulators-cds"
+ docker-root: ./mock-cds
+ docker-name: "onap/onap-component-mock-cds"
+ - gerrit-docker-verify:
+ project-name: "integration-onap-component-simulators-clamp"
+ docker-root: ./mock-clamp
+ docker-name: "onap/onap-component-mock-clamp"
+ - gerrit-docker-merge:
+ project-name: "integration-onap-component-simulators-clamp"
+ docker-root: ./mock-clamp
+ docker-name: "onap/onap-component-mock-clamp"
+ - gerrit-docker-verify:
+ project-name: "integration-onap-component-simulators-dmaap"
+ docker-root: ./mock-dmaap
+ docker-name: "onap/onap-component-mock-dmaap"
+ - gerrit-docker-merge:
+ project-name: "integration-onap-component-simulators-dmaap"
+ docker-root: ./mock-dmaap
+ docker-name: "onap/onap-component-mock-dmaap"
+ - gerrit-docker-verify:
+ project-name: "integration-onap-component-simulators-msb-k8s"
+ docker-root: ./mock-msb-k8s
+ docker-name: "onap/onap-component-mock-k8s"
+ - gerrit-docker-merge:
+ project-name: "integration-onap-component-simulators-msb-k8s"
+ docker-root: ./mock-msb-k8s
+ docker-name: "onap/onap-component-mock-k8s"
+ - gerrit-docker-verify:
+ project-name: "integration-onap-component-simulators-sdc"
+ docker-root: ./mock-sdc
+ docker-name: "onap/onap-component-mock-sdc"
+ - gerrit-docker-merge:
+ project-name: "integration-onap-component-simulators-sdc"
+ docker-root: ./mock-sdc
+ docker-name: "onap/onap-component-mock-sdc"
+ - gerrit-docker-verify:
+ project-name: "integration-onap-component-simulators-sdnc"
+ docker-root: ./mock-sdnc
+ docker-name: "onap/onap-component-mock-sdnc"
+ - gerrit-docker-merge:
+ project-name: "integration-onap-component-simulators-sdnc"
+ docker-root: ./mock-sdnc
+ docker-name: "onap/onap-component-mock-sdnc"
+ - gerrit-docker-verify:
+ project-name: "integration-onap-component-simulators-so"
+ docker-root: ./mock-so
+ docker-name: "onap/onap-component-mock-so"
+ - gerrit-docker-merge:
+ project-name: "integration-onap-component-simulators-so"
+ docker-root: ./mock-so
+ docker-name: "onap/onap-component-mock-so"
+ - gerrit-docker-verify:
+ project-name: "integration-onap-component-simulators-ves"
+ docker-root: ./mock-ves
+ docker-name: "onap/onap-component-mock-ves"
+ - gerrit-docker-merge:
+ project-name: "integration-onap-component-simulators-ves"
+ docker-root: ./mock-ves
+ docker-name: "onap/onap-component-mock-ves"
+ project: "integration/onap-component-simulators"
+ stream:
+ - "master":
+ branch: "master"
+ files: ""
+ docker-root: "$WORKSPACE"
+ mvn-settings: "integration-settings"
+ build-node: ubuntu1804-docker-8c-8g
+ cron: "@daily"
+ container-tag-method: stream
diff --git a/jjb/integration/simulators/integration-pnf-simulator.yaml b/jjb/integration/simulators/integration-pnf-simulator.yaml
index feae0d4..ff682a2 100644
--- a/jjb/integration/simulators/integration-pnf-simulator.yaml
+++ b/jjb/integration/simulators/integration-pnf-simulator.yaml
@@ -1,106 +1,103 @@
---
- project:
- name: integration-simulators-pnf-simulator
- project-name: integration-pnf-simulator
- stream:
- - 'master':
- branch: 'master'
- java-version: openjdk11
- project: 'integration/simulators/pnf-simulator'
- mvn-settings: 'integration-simulators-pnf-simulator-settings'
- files: '**'
- maven-deploy-properties: |
- deployAtEnd=true
- archive-artifacts: ''
- build-node: ubuntu1804-docker-8c-8g
- jobs:
- - '{project-name}-{stream}-verify-java':
- mvn-goals: 'clean install -P docker,integration -DskipNexusStagingDeployMojo=true -DskipDockerPush=true'
- - '{project-name}-{stream}-merge-java':
- mvn-goals: 'clean deploy'
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
- - gerrit-maven-stage:
- sign-artifacts: true
- build-node: centos7-docker-8c-8g
- maven-versions-plugin: true
- mvn-goals: 'clean deploy'
- - gerrit-maven-docker-stage:
- build-node: ubuntu1804-docker-8c-8g
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
- mvn-params: '-P docker,integration -DskipNexusStagingDeployMojo=true -DskipDockerPush=false'
+ name: integration-simulators-pnf-simulator
+ project-name: integration-pnf-simulator
+ stream:
+ - "master":
+ branch: "master"
+ java-version: openjdk11
+ project: "integration/simulators/pnf-simulator"
+ mvn-settings: "integration-simulators-pnf-simulator-settings"
+ files: "**"
+ maven-deploy-properties: |
+ deployAtEnd=true
+ archive-artifacts: ""
+ build-node: ubuntu1804-docker-8c-8g
+ jobs:
+ - "{project-name}-{stream}-verify-java":
+ mvn-goals: "clean install -P docker,integration -DskipNexusStagingDeployMojo=true -DskipDockerPush=true"
+ - "{project-name}-{stream}-merge-java":
+ mvn-goals: "clean deploy"
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
+ - gerrit-maven-stage:
+ sign-artifacts: true
+ build-node: centos8-docker-8c-8g
+ maven-versions-plugin: true
+ mvn-goals: "clean deploy"
+ - gerrit-maven-docker-stage:
+ build-node: ubuntu1804-docker-8c-8g
+ container-public-registry: "nexus3.onap.org:10001"
+ container-staging-registry: "nexus3.onap.org:10003"
+ mvn-params: "-P docker,integration -DskipNexusStagingDeployMojo=true -DskipDockerPush=false"
- project:
- name: integration-simulators-pnf-simulator-sonar
- java-version: openjdk11
- jobs:
- - gerrit-maven-sonar
- sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
- build-node: ubuntu1804-docker-8c-8g
- project: integration/simulators/pnf-simulator
- project-name: integration-pnf-simulator
- branch: 'master'
- mvn-settings: 'integration-simulators-pnf-simulator-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
+ name: integration-simulators-pnf-simulator-sonar
+ java-version: openjdk11
+ jobs:
+ - gerrit-maven-sonar
+ sonarcloud: true
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
+ build-node: ubuntu1804-docker-8c-8g
+ project: integration/simulators/pnf-simulator
+ project-name: integration-pnf-simulator
+ branch: "master"
+ mvn-settings: "integration-simulators-pnf-simulator-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
- project:
- name: integration-simulators-pnf-simulator-info
- project-name: integration-pnf-simulator
- jobs:
- - gerrit-info-yaml-verify
- build-node: centos8-builder-2c-1g
- project: integration/simulators/pnf-simulator
- branch: master
+ name: integration-simulators-pnf-simulator-info
+ project-name: integration-pnf-simulator
+ jobs:
+ - gerrit-info-yaml-verify
+ build-node: centos8-builder-2c-1g
+ project: integration/simulators/pnf-simulator
+ branch: master
- project:
- name: integration-simulators-pnf-simulator-cli
- project: integration/simulators/pnf-simulator
- project-name: integration-pnf-simulator
- python-version: python3
- jobs:
- - integration-tox-verify
- subproject:
- - 'simulator-cli':
- tox-dir: 'simulator-cli'
- tox-envs: 'pytest'
- pattern: '**/*'
- stream:
- - 'master':
- branch: 'master'
+ name: integration-simulators-pnf-simulator-cli
+ project: integration/simulators/pnf-simulator
+ project-name: integration-pnf-simulator
+ python-version: python3
+ jobs:
+ - integration-tox-verify
+ subproject:
+ - "simulator-cli":
+ tox-dir: "simulator-cli"
+ tox-envs: "pytest"
+ pattern: "**/*"
+ stream:
+ - "master":
+ branch: "master"
- project:
- name: integration-simulators-pnf-simulator-linters
- project: integration/simulators/pnf-simulator
- project-name: integration-pnf-simulator
- 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'
- stream:
- - 'master':
- branch: 'master'
-
+ name: integration-simulators-pnf-simulator-linters
+ project: integration/simulators/pnf-simulator
+ project-name: integration-pnf-simulator
+ 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"
+ stream:
+ - "master":
+ branch: "master"
diff --git a/jjb/integration/simulators/integration-ran-nssmf-simulator.yaml b/jjb/integration/simulators/integration-ran-nssmf-simulator.yaml
index c9b93d9..83456d9 100644
--- a/jjb/integration/simulators/integration-ran-nssmf-simulator.yaml
+++ b/jjb/integration/simulators/integration-ran-nssmf-simulator.yaml
@@ -21,26 +21,26 @@
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'
+ - "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'
+ - "master":
+ branch: "master"
diff --git a/jjb/integration/simulators/integration-ran-simulator.yaml b/jjb/integration/simulators/integration-ran-simulator.yaml
index 2c8584c..c630a87 100644
--- a/jjb/integration/simulators/integration-ran-simulator.yaml
+++ b/jjb/integration/simulators/integration-ran-simulator.yaml
@@ -1,31 +1,31 @@
---
- project:
- name: integration-simulators-ran-simulator
- project-name: integration-simulators-ran-simulator
- stream:
- - 'master':
- branch: 'master'
- project: 'integration/simulators/ran-simulator'
- mvn-settings: 'integration-simulators-ran-simulator-settings'
- maven-deploy-properties: |
- deployAtEnd=true
- archive-artifacts: ''
- build-node: ubuntu1804-docker-8c-8g
- jobs:
- - '{project-name}-{stream}-verify-java':
- mvn-goals: 'clean install'
- pattern: 'ransim/**'
- pom: 'ransim/pom.xml'
- - '{project-name}-{stream}-merge-java':
- mvn-goals: 'clean deploy'
- pom: 'ransim/pom.xml'
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
- - gerrit-maven-stage:
- sign-artifacts: true
- build-node: centos7-docker-8c-8g
- maven-versions-plugin: true
- mvn-goals: 'clean deploy'
+ name: integration-simulators-ran-simulator
+ project-name: integration-simulators-ran-simulator
+ stream:
+ - "master":
+ branch: "master"
+ project: "integration/simulators/ran-simulator"
+ mvn-settings: "integration-simulators-ran-simulator-settings"
+ maven-deploy-properties: |
+ deployAtEnd=true
+ archive-artifacts: ""
+ build-node: ubuntu1804-docker-8c-8g
+ jobs:
+ - "{project-name}-{stream}-verify-java":
+ mvn-goals: "clean install"
+ pattern: "ransim/**"
+ pom: "ransim/pom.xml"
+ - "{project-name}-{stream}-merge-java":
+ mvn-goals: "clean deploy"
+ pom: "ransim/pom.xml"
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
+ - gerrit-maven-stage:
+ sign-artifacts: true
+ build-node: centos8-docker-8c-8g
+ maven-versions-plugin: true
+ mvn-goals: "clean deploy"
- project:
name: integration-simulators-ran-simulator-info
@@ -44,18 +44,18 @@
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'
+ - "yaml":
+ tox-dir: "."
+ tox-envs: "yaml"
+ pattern: "**/*.yaml"
+ - "yml":
+ tox-dir: "."
+ tox-envs: "yaml"
+ pattern: "**/*.yml"
+ - "json":
+ tox-dir: "."
+ tox-envs: "json"
+ pattern: "**/*.json"
stream:
- - 'master':
- branch: 'master'
+ - "master":
+ branch: "master"
diff --git a/jjb/integration/simulators/nf-simulator/integration-pm-https-server-nf-simulator.yaml b/jjb/integration/simulators/nf-simulator/integration-pm-https-server-nf-simulator.yaml
index ac0c064..36a625e 100644
--- a/jjb/integration/simulators/nf-simulator/integration-pm-https-server-nf-simulator.yaml
+++ b/jjb/integration/simulators/nf-simulator/integration-pm-https-server-nf-simulator.yaml
@@ -1,66 +1,65 @@
---
- project:
- name: integration-simulators-nf-simulator-pm-https-server
- project-name: 'integration-simulators-nf-simulator-pm-https-server'
- java-version: openjdk11
- jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
- - gerrit-maven-stage:
- sign-artifacts: true
- build-node: centos7-docker-8c-8g
- maven-versions-plugin: true
- - gerrit-maven-docker-stage:
- build-node: ubuntu1804-docker-8c-8g
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
- mvn-goals: 'clean install -P docker -DskipDockerPush=false'
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
+ name: integration-simulators-nf-simulator-pm-https-server
+ project-name: "integration-simulators-nf-simulator-pm-https-server"
+ java-version: openjdk11
+ jobs:
+ - "{project-name}-{stream}-verify-java"
+ - "{project-name}-{stream}-merge-java"
+ - gerrit-maven-stage:
+ sign-artifacts: true
+ build-node: centos8-docker-8c-8g
+ maven-versions-plugin: true
+ - gerrit-maven-docker-stage:
+ build-node: ubuntu1804-docker-8c-8g
+ container-public-registry: "nexus3.onap.org:10001"
+ container-staging-registry: "nexus3.onap.org:10003"
+ mvn-goals: "clean install -P docker -DskipDockerPush=false"
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
- project: 'integration/simulators/nf-simulator/pm-https-server'
- stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'integration-simulators-nf-simulator-pm-https-server-settings'
- # due to a strange macro / variable translation problem this needs
- # to be passed as a string block to properly get the properties
- # correctly defined in the job
- maven-deploy-properties: |
- deployAtEnd=true
- files: '**'
- archive-artifacts: ''
- build-node: 'ubuntu1804-docker-8c-8g'
+ project: "integration/simulators/nf-simulator/pm-https-server"
+ stream:
+ - "master":
+ branch: "master"
+ mvn-settings: "integration-simulators-nf-simulator-pm-https-server-settings"
+ # due to a strange macro / variable translation problem this needs
+ # to be passed as a string block to properly get the properties
+ # correctly defined in the job
+ maven-deploy-properties: |
+ deployAtEnd=true
+ files: "**"
+ archive-artifacts: ""
+ build-node: "ubuntu1804-docker-8c-8g"
- project:
- name: integration-simulators-nf-simulator-pm-https-server-sonar
- java-version: openjdk11
- jobs:
- - gerrit-maven-sonar
- sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
- build-node: ubuntu1804-docker-8c-8g
- project: 'integration/simulators/nf-simulator/pm-https-server'
- project-name: 'integration-simulators-nf-simulator-pm-https-server'
- branch: 'master'
- mvn-settings: 'integration-simulators-nf-simulator-pm-https-server-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ name: integration-simulators-nf-simulator-pm-https-server-sonar
+ java-version: openjdk11
+ jobs:
+ - gerrit-maven-sonar
+ sonarcloud: true
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
+ build-node: ubuntu1804-docker-8c-8g
+ project: "integration/simulators/nf-simulator/pm-https-server"
+ project-name: "integration-simulators-nf-simulator-pm-https-server"
+ branch: "master"
+ mvn-settings: "integration-simulators-nf-simulator-pm-https-server-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
- project:
- name: integration-simulators-nf-simulator-pm-https-server-view
- project-name: integration-simulators-nf-simulator-pm-https-server
- views:
- - project-view
+ name: integration-simulators-nf-simulator-pm-https-server-view
+ project-name: integration-simulators-nf-simulator-pm-https-server
+ views:
+ - project-view
- project:
- name: integration-simulators-nf-simulator-pm-https-server-info
- project: integration/simulators/nf-simulator/pm-https-server
- project-name: integration-simulators-nf-simulator-pm-https-server
- build-node: centos8-builder-2c-1g
- jobs:
- - gerrit-info-yaml-verify
+ name: integration-simulators-nf-simulator-pm-https-server-info
+ project: integration/simulators/nf-simulator/pm-https-server
+ project-name: integration-simulators-nf-simulator-pm-https-server
+ build-node: centos8-builder-2c-1g
+ jobs:
+ - gerrit-info-yaml-verify
diff --git a/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-avcn-manager.yaml b/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-avcn-manager.yaml
index 4caba82..df86a28 100644
--- a/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-avcn-manager.yaml
+++ b/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-avcn-manager.yaml
@@ -1,66 +1,65 @@
---
- project:
- name: integration-simulators-nf-simulator-avcn-manager
- project-name: 'integration-simulators-nf-simulator-avcn-manager'
- java-version: openjdk11
- jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
- - gerrit-maven-stage:
- sign-artifacts: true
- build-node: centos7-docker-8c-8g
- maven-versions-plugin: true
- - gerrit-maven-docker-stage:
- build-node: ubuntu1804-docker-8c-8g
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
- mvn-goals: 'clean deploy -P docker -DskipDockerPush=false'
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
+ name: integration-simulators-nf-simulator-avcn-manager
+ project-name: "integration-simulators-nf-simulator-avcn-manager"
+ java-version: openjdk11
+ jobs:
+ - "{project-name}-{stream}-verify-java"
+ - "{project-name}-{stream}-merge-java"
+ - gerrit-maven-stage:
+ sign-artifacts: true
+ build-node: centos8-docker-8c-8g
+ maven-versions-plugin: true
+ - gerrit-maven-docker-stage:
+ build-node: ubuntu1804-docker-8c-8g
+ container-public-registry: "nexus3.onap.org:10001"
+ container-staging-registry: "nexus3.onap.org:10003"
+ mvn-goals: "clean deploy -P docker -DskipDockerPush=false"
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
- project: 'integration/simulators/nf-simulator/avcn-manager'
- stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'integration-simulators-nf-simulator-avcn-manager-settings'
- # due to a strange macro / variable translation problem this needs
- # to be passed as a string block to properly get the properties
- # correctly defined in the job
- maven-deploy-properties: |
- deployAtEnd=true
- files: '**'
- archive-artifacts: ''
- build-node: 'ubuntu1804-docker-8c-8g'
+ project: "integration/simulators/nf-simulator/avcn-manager"
+ stream:
+ - "master":
+ branch: "master"
+ mvn-settings: "integration-simulators-nf-simulator-avcn-manager-settings"
+ # due to a strange macro / variable translation problem this needs
+ # to be passed as a string block to properly get the properties
+ # correctly defined in the job
+ maven-deploy-properties: |
+ deployAtEnd=true
+ files: "**"
+ archive-artifacts: ""
+ build-node: "ubuntu1804-docker-8c-8g"
- project:
- name: integration-simulators-nf-simulator-avcn-manager-sonar
- java-version: openjdk11
- jobs:
- - gerrit-maven-sonar
- sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
- build-node: ubuntu1804-docker-8c-8g
- project: 'integration/simulators/nf-simulator/avcn-manager'
- project-name: 'integration-simulators-nf-simulator-avcn-manager'
- branch: 'master'
- mvn-settings: 'integration-simulators-nf-simulator-avcn-manager-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ name: integration-simulators-nf-simulator-avcn-manager-sonar
+ java-version: openjdk11
+ jobs:
+ - gerrit-maven-sonar
+ sonarcloud: true
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
+ build-node: ubuntu1804-docker-8c-8g
+ project: "integration/simulators/nf-simulator/avcn-manager"
+ project-name: "integration-simulators-nf-simulator-avcn-manager"
+ branch: "master"
+ mvn-settings: "integration-simulators-nf-simulator-avcn-manager-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
- project:
- name: integration-simulators-nf-simulator-avcn-manager-view
- project-name: integration-simulators-nf-simulator-avcn-manager
- views:
- - project-view
+ name: integration-simulators-nf-simulator-avcn-manager-view
+ project-name: integration-simulators-nf-simulator-avcn-manager
+ views:
+ - project-view
- project:
- name: integration-simulators-nf-simulator-avcn-manager-info
- project: integration/simulators/nf-simulator/avcn-manager
- project-name: integration-simulators-nf-simulator-avcn-manager
- build-node: centos8-builder-2c-1g
- jobs:
- - gerrit-info-yaml-verify
+ name: integration-simulators-nf-simulator-avcn-manager-info
+ project: integration/simulators/nf-simulator/avcn-manager
+ project-name: integration-simulators-nf-simulator-avcn-manager
+ build-node: centos8-builder-2c-1g
+ jobs:
+ - gerrit-info-yaml-verify
diff --git a/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-netconf-server-csit.yaml b/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-netconf-server-csit.yaml
index 1416394..633796c 100644
--- a/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-netconf-server-csit.yaml
+++ b/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-netconf-server-csit.yaml
@@ -1,15 +1,16 @@
+---
- project:
- name: integration-simulators-nf-simulator-netconf-server-csit
- jobs:
- - '{project-name}-{stream}-verify-csit-{functionality}'
- - '{project-name}-{stream}-csit-{functionality}'
- project-name: 'integration-simulators-nf-simulator-netconf-server'
- recipients: 'krzysztof.kuzmicki@nokia.com bogumil.zebek@nokia.com bartosz.gardziejewski@nokia.com'
- stream:
- - 'master':
- branch: 'master'
- functionality:
- - 'testsuites':
- trigger_jobs:
- - '{project-name}-{stream}-merge-java'
- robot-options: ''
+ name: integration-simulators-nf-simulator-netconf-server-csit
+ jobs:
+ - "{project-name}-{stream}-verify-csit-{functionality}"
+ - "{project-name}-{stream}-csit-{functionality}"
+ project-name: "integration-simulators-nf-simulator-netconf-server"
+ recipients: "krzysztof.kuzmicki@nokia.com bogumil.zebek@nokia.com bartosz.gardziejewski@nokia.com"
+ stream:
+ - "master":
+ branch: "master"
+ functionality:
+ - "testsuites":
+ trigger_jobs:
+ - "{project-name}-{stream}-merge-java"
+ robot-options: ""
diff --git a/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-netconf-server.yaml b/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-netconf-server.yaml
index a3345c8..8c0039c 100644
--- a/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-netconf-server.yaml
+++ b/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-netconf-server.yaml
@@ -1,66 +1,64 @@
---
+- project:
+ name: integration-simulators-nf-simulator-netconf-server
+ project-name: "integration-simulators-nf-simulator-netconf-server"
+ python-version: python3.8
+ jobs:
+ - "{project-name}-{stream}-verify-java"
+ - "{project-name}-{stream}-merge-java"
+ - gerrit-maven-stage:
+ sign-artifacts: true
+ build-node: centos8-docker-8c-8g
+ maven-versions-plugin: true
+ - gerrit-maven-docker-stage:
+ build-node: ubuntu1804-docker-8c-8g
+ container-public-registry: "nexus3.onap.org:10001"
+ container-staging-registry: "nexus3.onap.org:10003"
+ mvn-goals: "clean install -P docker -DskipDockerPush=false"
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
+
+ project: "integration/simulators/nf-simulator/netconf-server"
+ stream:
+ - "master":
+ branch: "master"
+ mvn-settings: "integration-simulators-nf-simulator-netconf-server-settings"
+ # due to a strange macro / variable translation problem this needs
+ # to be passed as a string block to properly get the properties
+ # correctly defined in the job
+ maven-deploy-properties: |
+ deployAtEnd=true
+ files: "**"
+ archive-artifacts: ""
+ build-node: "ubuntu1804-docker-8c-8g"
- project:
- name: integration-simulators-nf-simulator-netconf-server
- project-name: 'integration-simulators-nf-simulator-netconf-server'
- python-version: python3.8
- jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
- - gerrit-maven-stage:
- sign-artifacts: true
- build-node: centos7-docker-8c-8g
- maven-versions-plugin: true
- - gerrit-maven-docker-stage:
- build-node: ubuntu1804-docker-8c-8g
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
- mvn-goals: 'clean install -P docker -DskipDockerPush=false'
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
-
- project: 'integration/simulators/nf-simulator/netconf-server'
- stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'integration-simulators-nf-simulator-netconf-server-settings'
- # due to a strange macro / variable translation problem this needs
- # to be passed as a string block to properly get the properties
- # correctly defined in the job
- maven-deploy-properties: |
- deployAtEnd=true
- files: '**'
- archive-artifacts: ''
- build-node: 'ubuntu1804-docker-8c-8g'
+ name: integration-simulators-nf-simulator-netconf-server-sonar
+ jobs:
+ - gerrit-maven-sonar
+ sonarcloud: true
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
+ build-node: ubuntu1804-docker-8c-8g
+ project: "integration/simulators/nf-simulator/netconf-server"
+ project-name: "integration-simulators-nf-simulator-netconf-server"
+ branch: "master"
+ mvn-settings: "integration-simulators-nf-simulator-netconf-server-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
- project:
- name: integration-simulators-nf-simulator-netconf-server-sonar
- jobs:
- - gerrit-maven-sonar
- sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
- build-node: ubuntu1804-docker-8c-8g
- project: 'integration/simulators/nf-simulator/netconf-server'
- project-name: 'integration-simulators-nf-simulator-netconf-server'
- branch: 'master'
- mvn-settings: 'integration-simulators-nf-simulator-netconf-server-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ name: integration-simulators-nf-simulator-netconf-server-view
+ project-name: integration-simulators-nf-simulator-netconf-server
+ views:
+ - project-view
- project:
- name: integration-simulators-nf-simulator-netconf-server-view
- project-name: integration-simulators-nf-simulator-netconf-server
- views:
- - project-view
-
-- project:
- name: integration-simulators-nf-simulator-netconf-server-info
- project: integration/simulators/nf-simulator/netconf-server
- project-name: integration-simulators-nf-simulator-netconf-server
- build-node: centos8-builder-2c-1g
- jobs:
- - gerrit-info-yaml-verify
+ name: integration-simulators-nf-simulator-netconf-server-info
+ project: integration/simulators/nf-simulator/netconf-server
+ project-name: integration-simulators-nf-simulator-netconf-server
+ build-node: centos8-builder-2c-1g
+ jobs:
+ - gerrit-info-yaml-verify
diff --git a/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-simulator-cli.yaml b/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-simulator-cli.yaml
index e260745..af4f05a 100644
--- a/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-simulator-cli.yaml
+++ b/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-simulator-cli.yaml
@@ -1,41 +1,41 @@
---
- project:
- name: integration-simulators-nf-simulator-simulator-cli
- project-name: 'integration-simulators-nf-simulator'
- python-version: python3
- tox-dir: '.'
- tox-envs: ''
- subproject:
- - simulator-cli:
- path: './simulator-cli'
- pattern: '**'
- project: 'integration/simulators/nf-simulator'
- stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'integration-simulators-nf-simulator-settings'
- build-node: ubuntu1804-builder-4c-4g
- jobs:
- - '{project-name}-{stream}-{subproject}-verify-python'
+ name: integration-simulators-nf-simulator-simulator-cli
+ project-name: "integration-simulators-nf-simulator"
+ python-version: python3
+ tox-dir: "."
+ tox-envs: ""
+ subproject:
+ - simulator-cli:
+ path: "./simulator-cli"
+ pattern: "**"
+ project: "integration/simulators/nf-simulator"
+ stream:
+ - "master":
+ branch: "master"
+ mvn-settings: "integration-simulators-nf-simulator-settings"
+ build-node: ubuntu1804-builder-4c-4g
+ jobs:
+ - "{project-name}-{stream}-{subproject}-verify-python"
- project:
- name: integration-simulators-nf-simulator-sonar
- jobs:
- - gerrit-tox-sonar
- cron: '@daily'
- build-node: ubuntu1804-builder-4c-4g
- project: 'integration/simulators/nf-simulator'
- project-name: 'integration-simulators-nf-simulator'
- branch: 'master'
- mvn-settings: 'integration-simulators-nf-simulator-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ name: integration-simulators-nf-simulator-sonar
+ jobs:
+ - gerrit-tox-sonar
+ cron: "@daily"
+ build-node: ubuntu1804-builder-4c-4g
+ project: "integration/simulators/nf-simulator"
+ project-name: "integration-simulators-nf-simulator"
+ branch: "master"
+ mvn-settings: "integration-simulators-nf-simulator-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
- project:
- name: integration-simulators-nf-simulator-info
- jobs:
- - gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
- project: 'integration/simulators/nf-simulator'
- project-name: 'integration-simulators-nf-simulator'
- branch: 'master'
+ name: integration-simulators-nf-simulator-info
+ jobs:
+ - gerrit-info-yaml-verify
+ build-node: centos8-builder-2c-1g
+ project: "integration/simulators/nf-simulator"
+ project-name: "integration-simulators-nf-simulator"
+ branch: "master"
diff --git a/jjb/integration/simulators/nf-simulator/integration-ves-client-nf-simulator.yaml b/jjb/integration/simulators/nf-simulator/integration-ves-client-nf-simulator.yaml
index 2994573..a8ad871 100644
--- a/jjb/integration/simulators/nf-simulator/integration-ves-client-nf-simulator.yaml
+++ b/jjb/integration/simulators/nf-simulator/integration-ves-client-nf-simulator.yaml
@@ -1,66 +1,65 @@
---
- project:
- name: integration-simulators-nf-simulator-ves-client
- project-name: 'integration-simulators-nf-simulator-ves-client'
- java-version: openjdk11
- jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
- - gerrit-maven-stage:
- sign-artifacts: true
- build-node: centos7-docker-8c-8g
- maven-versions-plugin: true
- - gerrit-maven-docker-stage:
- build-node: ubuntu1804-docker-8c-8g
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
- mvn-goals: 'clean deploy -P docker -DskipDockerPush=false'
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
+ name: integration-simulators-nf-simulator-ves-client
+ project-name: "integration-simulators-nf-simulator-ves-client"
+ java-version: openjdk11
+ jobs:
+ - "{project-name}-{stream}-verify-java"
+ - "{project-name}-{stream}-merge-java"
+ - gerrit-maven-stage:
+ sign-artifacts: true
+ build-node: centos8-docker-8c-8g
+ maven-versions-plugin: true
+ - gerrit-maven-docker-stage:
+ build-node: ubuntu1804-docker-8c-8g
+ container-public-registry: "nexus3.onap.org:10001"
+ container-staging-registry: "nexus3.onap.org:10003"
+ mvn-goals: "clean deploy -P docker -DskipDockerPush=false"
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
- project: 'integration/simulators/nf-simulator/ves-client'
- stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'integration-simulators-nf-simulator-ves-client-settings'
- # due to a strange macro / variable translation problem this needs
- # to be passed as a string block to properly get the properties
- # correctly defined in the job
- maven-deploy-properties: |
- deployAtEnd=true
- files: '**'
- archive-artifacts: ''
- build-node: 'ubuntu1804-docker-8c-8g'
+ project: "integration/simulators/nf-simulator/ves-client"
+ stream:
+ - "master":
+ branch: "master"
+ mvn-settings: "integration-simulators-nf-simulator-ves-client-settings"
+ # due to a strange macro / variable translation problem this needs
+ # to be passed as a string block to properly get the properties
+ # correctly defined in the job
+ maven-deploy-properties: |
+ deployAtEnd=true
+ files: "**"
+ archive-artifacts: ""
+ build-node: "ubuntu1804-docker-8c-8g"
- project:
- name: integration-simulators-nf-simulator-ves-client-sonar
- java-version: openjdk11
- jobs:
- - gerrit-maven-sonar
- sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
- build-node: ubuntu1804-docker-8c-8g
- project: 'integration/simulators/nf-simulator/ves-client'
- project-name: 'integration-simulators-nf-simulator-ves-client'
- branch: 'master'
- mvn-settings: 'integration-simulators-nf-simulator-ves-client-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ name: integration-simulators-nf-simulator-ves-client-sonar
+ java-version: openjdk11
+ jobs:
+ - gerrit-maven-sonar
+ sonarcloud: true
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
+ build-node: ubuntu1804-docker-8c-8g
+ project: "integration/simulators/nf-simulator/ves-client"
+ project-name: "integration-simulators-nf-simulator-ves-client"
+ branch: "master"
+ mvn-settings: "integration-simulators-nf-simulator-ves-client-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
- project:
- name: integration-simulators-nf-simulator-ves-client-view
- project-name: integration-simulators-nf-simulator-ves-client
- views:
- - project-view
+ name: integration-simulators-nf-simulator-ves-client-view
+ project-name: integration-simulators-nf-simulator-ves-client
+ views:
+ - project-view
- project:
- name: integration-simulators-nf-simulator-ves-client-info
- project: integration/simulators/nf-simulator/ves-client
- project-name: integration-simulators-nf-simulator-ves-client
- build-node: centos7-builder-2c-1g
- jobs:
- - gerrit-info-yaml-verify
+ name: integration-simulators-nf-simulator-ves-client-info
+ project: integration/simulators/nf-simulator/ves-client
+ project-name: integration-simulators-nf-simulator-ves-client
+ build-node: centos8-builder-2c-1g
+ jobs:
+ - gerrit-info-yaml-verify
diff --git a/jjb/integration/usecases/integration-usecases-A1-policy-enforcement-r-apps.yaml b/jjb/integration/usecases/integration-usecases-A1-policy-enforcement-r-apps.yaml
index f61a878..68806f2 100644
--- a/jjb/integration/usecases/integration-usecases-A1-policy-enforcement-r-apps.yaml
+++ b/jjb/integration/usecases/integration-usecases-A1-policy-enforcement-r-apps.yaml
@@ -3,7 +3,7 @@
name: integration-usecases-A1-policy-enforcement-r-apps-info
project: integration/usecases/A1-policy-enforcement-r-apps
project-name: integration-usecases-A1-policy-enforcement-r-apps
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
jobs:
- gerrit-info-yaml-verify
@@ -15,26 +15,26 @@
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'
+ - "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'
+ - "master":
+ branch: "master"
diff --git a/jjb/integration/usecases/integration-usecases-A1-policy-enforcement.yaml b/jjb/integration/usecases/integration-usecases-A1-policy-enforcement.yaml
index 13659e6..aa3c77b 100644
--- a/jjb/integration/usecases/integration-usecases-A1-policy-enforcement.yaml
+++ b/jjb/integration/usecases/integration-usecases-A1-policy-enforcement.yaml
@@ -1,10 +1,9 @@
---
-
- project:
name: integration-usecases-A1-policy-enforcement-info
project: integration/usecases/A1-policy-enforcement
project-name: integration-usecases-A1-policy-enforcement
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
jobs:
- gerrit-info-yaml-verify
@@ -16,26 +15,26 @@
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'
+ - "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'
+ - "master":
+ branch: "master"
diff --git a/jjb/integration/xtesting/integration-xtesting.yaml b/jjb/integration/xtesting/integration-xtesting.yaml
index 654b6be..575fa19 100644
--- a/jjb/integration/xtesting/integration-xtesting.yaml
+++ b/jjb/integration/xtesting/integration-xtesting.yaml
@@ -4,131 +4,131 @@
project-name: integration-xtesting
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: integration/xtesting
branch: master
- project:
- name: integration-xtesting-linters
- project: integration/xtesting
- project-name: integration-xtesting
- python-version: python3
- jobs:
- - integration-linters
- subproject:
- - 'commit':
- tox-dir: '.'
- tox-envs: 'gitlint'
- pattern: '**'
- - 'yaml':
- tox-dir: '.'
- tox-envs: 'yaml'
- pattern: '**/*.yaml'
- - 'yml':
- tox-dir: '.'
- tox-envs: 'yaml'
- pattern: '**/*.yml'
- - 'json':
- tox-dir: '.'
- tox-envs: 'json'
- pattern: '**/*.json'
- - 'md':
- tox-dir: '.'
- tox-envs: 'md'
- pattern: '**/*.md'
- stream:
- - 'master':
- branch: 'master'
- - 'istanbul':
- branch: 'istanbul'
- - 'jakarta':
- branch: 'jakarta'
+ name: integration-xtesting-linters
+ project: integration/xtesting
+ project-name: integration-xtesting
+ python-version: python3
+ jobs:
+ - integration-linters
+ subproject:
+ - "commit":
+ tox-dir: "."
+ tox-envs: "gitlint"
+ pattern: "**"
+ - "yaml":
+ tox-dir: "."
+ tox-envs: "yaml"
+ pattern: "**/*.yaml"
+ - "yml":
+ tox-dir: "."
+ tox-envs: "yaml"
+ pattern: "**/*.yml"
+ - "json":
+ tox-dir: "."
+ tox-envs: "json"
+ pattern: "**/*.json"
+ - "md":
+ tox-dir: "."
+ tox-envs: "md"
+ pattern: "**/*.md"
+ stream:
+ - "master":
+ branch: "master"
+ - "jakarta":
+ branch: "jakarta"
+ - "kohn":
+ branch: "kohn"
- project:
name: integration-xtesting-release
- project-name: 'integration-xtesting'
- project: 'integration/xtesting'
- mvn-settings: 'integration-settings'
+ project-name: "integration-xtesting"
+ project: "integration/xtesting"
+ mvn-settings: "integration-settings"
jobs:
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
- project:
- name: 'integration-xtesting-docker'
+ name: "integration-xtesting-docker"
jobs:
- gerrit-docker-verify:
- project-name: 'integration-xtesting-infra-healthcheck'
+ project-name: "integration-xtesting-infra-healthcheck"
docker-root: ./infra-healthcheck
- docker-name: 'onap/xtesting-infra-healthcheck'
- docker-build-args: '-f ./docker/Dockerfile'
+ docker-name: "onap/xtesting-infra-healthcheck"
+ docker-build-args: "-f ./docker/Dockerfile"
- gerrit-docker-merge:
- project-name: 'integration-xtesting-infra-healthcheck'
+ project-name: "integration-xtesting-infra-healthcheck"
docker-root: ./infra-healthcheck
- docker-name: 'onap/xtesting-infra-healthcheck'
- docker-build-args: '-f ./docker/Dockerfile'
+ docker-name: "onap/xtesting-infra-healthcheck"
+ docker-build-args: "-f ./docker/Dockerfile"
- gerrit-docker-verify:
- project-name: 'integration-xtesting-healthcheck'
+ project-name: "integration-xtesting-healthcheck"
docker-root: ./healthcheck
- docker-name: 'onap/xtesting-healthcheck'
- docker-build-args: '-f ./docker/Dockerfile'
+ docker-name: "onap/xtesting-healthcheck"
+ docker-build-args: "-f ./docker/Dockerfile"
- gerrit-docker-merge:
- project-name: 'integration-xtesting-healthcheck'
+ project-name: "integration-xtesting-healthcheck"
docker-root: ./healthcheck
- docker-name: 'onap/xtesting-healthcheck'
- docker-build-args: '-f ./docker/Dockerfile'
+ docker-name: "onap/xtesting-healthcheck"
+ docker-build-args: "-f ./docker/Dockerfile"
- gerrit-docker-verify:
- project-name: 'integration-xtesting-smoke-usecases-pythonsdk'
+ project-name: "integration-xtesting-smoke-usecases-pythonsdk"
docker-root: ./smoke-usecases-pythonsdk
- docker-name: 'onap/xtesting-smoke-usecases-pythonsdk'
- docker-build-args: '-f ./docker/Dockerfile'
+ docker-name: "onap/xtesting-smoke-usecases-pythonsdk"
+ docker-build-args: "-f ./docker/Dockerfile"
- gerrit-docker-merge:
- project-name: 'integration-xtesting-smoke-usecases-pythonsdk'
+ project-name: "integration-xtesting-smoke-usecases-pythonsdk"
docker-root: ./smoke-usecases-pythonsdk
- docker-name: 'onap/xtesting-smoke-usecases-pythonsdk'
- docker-build-args: '-f ./docker/Dockerfile'
+ docker-name: "onap/xtesting-smoke-usecases-pythonsdk"
+ docker-build-args: "-f ./docker/Dockerfile"
- gerrit-docker-verify:
- project-name: 'integration-xtesting-smoke-usecases-robot'
+ project-name: "integration-xtesting-smoke-usecases-robot"
docker-root: ./smoke-usecases-robot
- docker-name: 'onap/xtesting-smoke-usecases-robot'
- docker-build-args: '-f ./docker/Dockerfile'
+ docker-name: "onap/xtesting-smoke-usecases-robot"
+ docker-build-args: "-f ./docker/Dockerfile"
- gerrit-docker-merge:
- project-name: 'integration-xtesting-smoke-usecases-robot'
+ project-name: "integration-xtesting-smoke-usecases-robot"
docker-root: ./smoke-usecases-robot
- docker-name: 'onap/xtesting-smoke-usecases-robot'
- docker-build-args: '-f ./docker/Dockerfile'
+ docker-name: "onap/xtesting-smoke-usecases-robot"
+ docker-build-args: "-f ./docker/Dockerfile"
- gerrit-docker-verify:
- project-name: 'integration-xtesting-security'
+ project-name: "integration-xtesting-security"
docker-root: ./security
- docker-name: 'onap/xtesting-security'
- docker-build-args: '-f ./docker/Dockerfile'
+ docker-name: "onap/xtesting-security"
+ docker-build-args: "-f ./docker/Dockerfile"
- gerrit-docker-merge:
- project-name: 'integration-xtesting-security'
+ project-name: "integration-xtesting-security"
docker-root: ./security
- docker-name: 'onap/xtesting-security'
- docker-build-args: '-f ./docker/Dockerfile'
+ docker-name: "onap/xtesting-security"
+ docker-build-args: "-f ./docker/Dockerfile"
- gerrit-docker-verify:
- project-name: 'integration-xtesting-smoke-usecases-robot-py3'
+ project-name: "integration-xtesting-smoke-usecases-robot-py3"
docker-root: ./smoke-usecases-robot-py3
- docker-name: 'onap/xtesting-smoke-usecases-robot-py3'
- docker-build-args: '-f ./docker/Dockerfile'
+ docker-name: "onap/xtesting-smoke-usecases-robot-py3"
+ docker-build-args: "-f ./docker/Dockerfile"
- gerrit-docker-merge:
- project-name: 'integration-xtesting-smoke-usecases-robot-py3'
+ project-name: "integration-xtesting-smoke-usecases-robot-py3"
docker-root: ./smoke-usecases-robot-py3
- docker-name: 'onap/xtesting-smoke-usecases-robot-py3'
- docker-build-args: '-f ./docker/Dockerfile'
- project: 'integration/xtesting'
+ docker-name: "onap/xtesting-smoke-usecases-robot-py3"
+ docker-build-args: "-f ./docker/Dockerfile"
+ project: "integration/xtesting"
stream:
- - 'master':
- branch: 'master'
- files: ''
- - 'istanbul':
- branch: 'istanbul'
- files: ''
- - 'jakarta':
- branch: 'jakarta'
- files: ''
- docker-root: '$WORKSPACE'
- mvn-settings: 'integration-settings'
+ - "master":
+ branch: "master"
+ files: ""
+ - "jakarta":
+ branch: "jakarta"
+ files: ""
+ - "kohn":
+ branch: "kohn"
+ files: ""
+ docker-root: "$WORKSPACE"
+ mvn-settings: "integration-settings"
build-node: ubuntu1804-docker-8c-8g
- cron: '@daily'
+ cron: "@daily"
container-tag-method: stream
diff --git a/jjb/lab/lab-templates.yaml b/jjb/lab/lab-templates.yaml
index 234d1fc..9c832c6 100644
--- a/jjb/lab/lab-templates.yaml
+++ b/jjb/lab/lab-templates.yaml
@@ -1,32 +1,31 @@
---
- job-template:
- name: 'lab-{job-name}'
- description: '{job-desc}'
+ name: "lab-{job-name}"
+ description: "{job-desc}"
disabled: false
project-type: freestyle
build-node: ubuntu1804-builder-4c-4g
properties:
- lf-infra-properties:
- project: 'integration'
- build-days-to-keep: '{build-days-to-keep}'
+ project: "integration"
+ build-days-to-keep: "{build-days-to-keep}"
parameters:
- string:
name: LOG_DIR_URL
- description: 'URL for the log directory produced by the external job'
+ description: "URL for the log directory produced by the external job"
- string:
name: SRC_BUILD_URL
- description: 'URL for the external Jenkins build triggering this build'
+ description: "URL for the external Jenkins build triggering this build"
wrappers:
- lf-infra-wrappers:
- build-timeout: '{build-timeout}'
- jenkins-ssh-credential: '{jenkins-ssh-credential}'
+ build-timeout: "{build-timeout}"
+ jenkins-ssh-credential: "{jenkins-ssh-credential}"
builders:
- - shell:
- !include-raw:
+ - shell: !include-raw:
- include-raw-lab-retrieve-logs.sh
publishers:
diff --git a/jjb/lab/lab.yaml b/jjb/lab/lab.yaml
index 7fbbe61..2de7321 100644
--- a/jjb/lab/lab.yaml
+++ b/jjb/lab/lab.yaml
@@ -2,7 +2,7 @@
- project:
name: lab
jobs:
- - 'lab-{job-name}'
+ - "lab-{job-name}"
job-name:
- "windriver-oom-daily":
job-desc: "OOM-based deployment into Wind River lab Integration-OOM-Daily tenant"
diff --git a/jjb/lf-infra-releasedockerhub.yaml b/jjb/lf-infra-releasedockerhub.yaml
index fac5181..da831e2 100644
--- a/jjb/lf-infra-releasedockerhub.yaml
+++ b/jjb/lf-infra-releasedockerhub.yaml
@@ -3,66 +3,63 @@
name: lf-onap-releasedockerhub-macro
builders:
- shell: !include-raw-escape:
- - ../shell/run_releasedockerhub.sh
- ##- ../shell/run_releasedockerhub.sh "{org} {summary} {verbose} {copy}"
-
+ - ../shell/run_releasedockerhub.sh
- job:
name: lf-onap-release-docker-hub
build-timeout: 90
project-type: freestyle
- node: ubuntu1804-docker-8c-8g ## Probably don't need this much
+ node: ubuntu1804-docker-8c-8g ## Probably don't need this much
disable-job: false
- disabled: '{disable-job}'
+ disabled: "{disable-job}"
# Runs once a day
triggers:
- - timed: '@daily'
+ - timed: "@daily"
-# Define needed parameters for lf-infra-docker-login
+ # Define needed parameters for lf-infra-docker-login
parameters:
- string:
name: DOCKER_REGISTRY
- default: 'nexus3.onap.org'
+ default: "nexus3.onap.org"
- string:
name: REGISTRY_PORTS
- default: '10002'
+ default: "10002"
- string:
name: DOCKERHUB_REGISTRY
- default: 'docker.io'
+ default: "docker.io"
-# Define needed parameters for lf-onap-releasedockerhub-macro
+ # Define needed parameters for lf-onap-releasedockerhub-macro
- string:
name: RELEASEDOCKERHUB_ORG
- default: 'onap'
- description: ''
+ default: "onap"
+ description: ""
- string:
name: RELEASEDOCKERHUB_REPO
- default: ''
- description: 'Only match repos that contains this string'
+ default: ""
+ description: "Only match repos that contains this string"
- string:
name: RELEASEDOCKERHUB_EXACT
- default: ''
- description: 'Repo has to exactly match RELEASEDOCKERHUB_REPO '
+ default: ""
+ description: "Repo has to exactly match RELEASEDOCKERHUB_REPO "
- string:
name: RELEASEDOCKERHUB_SUMMARY
- default: 'Yes'
- description: 'Provides a brief statistic summary of what it found, and what it should do. Activate with Yes'
+ default: "Yes"
+ # yamllint disable-line rule:line-length
+ description: "Provides a brief statistic summary of what it found, and what it should do. Activate with Yes"
- string:
name: RELEASEDOCKERHUB_VERBOSE
- default: ''
- description: 'Provides a verbose output of the operations. Activate with Yes'
+ default: ""
+ description: "Provides a verbose output of the operations. Activate with Yes"
- string:
name: RELEASEDOCKERHUB_COPY
- default: 'Yes'
- description: 'If a copy operation should be done from Nexus3 to docker hub. Activate with Yes'
-
+ default: "Yes"
+ description: "If a copy operation should be done from Nexus3 to docker hub. Activate with Yes"
builders:
- - lf-infra-pre-build ## shell/python-tools-install.sh
+ - lf-infra-pre-build ## shell/python-tools-install.sh
- lf-infra-docker-login:
- global-settings-file: 'global-settings'
- settings-file: 'onap-releasedockerhub-authz-settings'
- - lf-onap-releasedockerhub-macro:
-
+ global-settings-file: "global-settings"
+ settings-file: "onap-releasedockerhub-authz-settings"
+ - lf-onap-releasedockerhub-macro
diff --git a/jjb/lf-infra-sandbox-3.yaml b/jjb/lf-infra-sandbox-3.yaml
index 6f496d5..4bd142b 100644
--- a/jjb/lf-infra-sandbox-3.yaml
+++ b/jjb/lf-infra-sandbox-3.yaml
@@ -4,6 +4,6 @@
project-name: sandbox-3
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: sandbox-3
branch: master
diff --git a/jjb/modeling/modeling-etsicatalog-csit.yaml b/jjb/modeling/modeling-etsicatalog-csit.yaml
index e699b68..900bd9e 100644
--- a/jjb/modeling/modeling-etsicatalog-csit.yaml
+++ b/jjb/modeling/modeling-etsicatalog-csit.yaml
@@ -2,13 +2,13 @@
- project:
name: modeling-etsicatalog-csit
jobs:
- - '{project-name}-{stream}-verify-csit-{functionality}'
- - '{project-name}-{stream}-csit-{functionality}'
- project-name: 'modeling-etsicatalog'
- recipients: 'denghui12@huawei.com'
- stream: 'master'
+ - "{project-name}-{stream}-verify-csit-{functionality}"
+ - "{project-name}-{stream}-csit-{functionality}"
+ project-name: "modeling-etsicatalog"
+ recipients: "denghui12@huawei.com"
+ stream: "master"
functionality:
- - 'sanity-check':
- trigger_jobs: 'modeling-etsicatalog-master-docker-java-version-shell-daily'
- robot-options: ''
- branch: 'master'
+ - "sanity-check":
+ trigger_jobs: "modeling-etsicatalog-master-docker-java-version-shell-daily"
+ robot-options: ""
+ branch: "master"
diff --git a/jjb/modeling/modeling-etsicatalog.yaml b/jjb/modeling/modeling-etsicatalog.yaml
index 72115a4..5620683 100644
--- a/jjb/modeling/modeling-etsicatalog.yaml
+++ b/jjb/modeling/modeling-etsicatalog.yaml
@@ -1,37 +1,35 @@
---
-
- project:
name: modeling-etsicatalog
- project-name: 'modeling-etsicatalog'
- project: 'modeling/etsicatalog'
+ project-name: "modeling-etsicatalog"
+ project: "modeling/etsicatalog"
stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'modeling-etsicatalog-settings'
+ - "master":
+ branch: "master"
+ mvn-settings: "modeling-etsicatalog-settings"
subproject:
- - 'etsicatalog':
- path: '.'
- pattern: '**'
+ - "etsicatalog":
+ path: "."
+ pattern: "**"
jobs:
- - '{project-name}-{stream}-{subproject}-verify-python'
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
+ - "{project-name}-{stream}-{subproject}-verify-python"
+ - "{project-name}-{stream}-verify-java"
+ - "{project-name}-{stream}-merge-java"
- gerrit-maven-stage:
sign-artifacts: true
- build-node: centos7-docker-8c-8g
+ build-node: centos8-docker-8c-8g
maven-versions-plugin: true
sbom-generator: true
- - '{project-name}-{stream}-docker-java-version-shell-daily':
- docker-pom: 'pom.xml'
- mvn-goals: 'install'
- script:
- !include-raw-escape: 'build-modeling-etsicatalog-docker-image.sh'
+ - "{project-name}-{stream}-docker-java-version-shell-daily":
+ docker-pom: "pom.xml"
+ mvn-goals: "install"
+ script: !include-raw-escape: "build-modeling-etsicatalog-docker-image.sh"
build-node: ubuntu1804-docker-8c-8g
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
- files: '**'
- archive-artifacts: ''
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
+ files: "**"
+ archive-artifacts: ""
build-node: ubuntu1804-builder-4c-4g
- project:
@@ -39,35 +37,34 @@
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
build-node: ubuntu1804-builder-4c-4g
- project: 'modeling/etsicatalog'
- project-name: 'modeling-etsicatalog'
- branch: 'master'
- mvn-settings: 'modeling-etsicatalog-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ project: "modeling/etsicatalog"
+ project-name: "modeling-etsicatalog"
+ branch: "master"
+ mvn-settings: "modeling-etsicatalog-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
- project:
name: modeling-etsicatalog-clm
jobs:
- gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
+ nexus-iq-namespace: "onap-"
project: modeling/etsicatalog
- project-name: 'modeling-etsicatalog'
+ project-name: "modeling-etsicatalog"
build-node: centos8-redis-4c-4g
- branch: 'master'
- mvn-settings: 'modeling-etsicatalog-settings'
+ branch: "master"
+ mvn-settings: "modeling-etsicatalog-settings"
- project:
name: modeling-etsicatalog-info
project-name: modeling-etsicatalog
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: modeling/etsicatalog
branch: master
diff --git a/jjb/modeling/modeling-modelspec.yaml b/jjb/modeling/modeling-modelspec.yaml
index 1cae6b7..8a0b3d6 100644
--- a/jjb/modeling/modeling-modelspec.yaml
+++ b/jjb/modeling/modeling-modelspec.yaml
@@ -4,6 +4,6 @@
project-name: modeling-modelspec
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: modeling/modelspec
branch: master
diff --git a/jjb/msb/msb-apigateway.yaml b/jjb/msb/msb-apigateway.yaml
index b2d8bed..6fe3257 100644
--- a/jjb/msb/msb-apigateway.yaml
+++ b/jjb/msb/msb-apigateway.yaml
@@ -7,86 +7,66 @@
- project:
name: msb-apigateway
- project-name: 'msb-apigateway'
+ project-name: "msb-apigateway"
jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
+ - "{project-name}-{stream}-verify-java"
+ - "{project-name}-{stream}-merge-java"
- gerrit-maven-stage:
+ sbom-generator: true
sign-artifacts: true
- build-node: centos7-builder-4c-4g
+ build-node: centos8-docker-4c-4g
maven-versions-plugin: true
- gerrit-maven-docker-stage:
+ sbom-generator: true
build-node: ubuntu1804-docker-8c-8g
maven-versions-plugin: true
- mvn-pom: 'distributions/msb-apigateway/pom.xml'
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
- mvn-params: '-f distributions/msb-apigateway/pom.xml -Dmaven.test.skip=true -P linux,docker'
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
- project: 'msb/apigateway'
+ mvn-pom: "distributions/msb-apigateway/pom.xml"
+ container-public-registry: "nexus3.onap.org:10001"
+ container-staging-registry: "nexus3.onap.org:10003"
+ mvn-params: "-f distributions/msb-apigateway/pom.xml -Dmaven.test.skip=true -P linux,docker"
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
+ project: "msb/apigateway"
stream:
- - 'master':
- branch: 'master'
- - 'istanbul':
- branch: 'istanbul'
- mvn-settings: 'msb-apigateway-settings'
- files: '**'
- archive-artifacts: ''
+ - "master":
+ branch: "master"
+ mvn-settings: "msb-apigateway-settings"
+ files: "**"
+ archive-artifacts: ""
build-node: ubuntu1804-builder-4c-4g
-#- project:
-# name: msb-apigateway-arm64
-# project-name: 'msb-apigateway-arm64'
-# jobs:
-# - '{project-name}-{stream}-docker-java-version-shell-daily':
-# docker-pom: 'pom.xml'
-# mvn-goals: 'install'
-# script:
-# !include-raw-escape: 'build-apigateway-docker-image.sh'
-#
-# project: 'msb/apigateway'
-# stream:
-# - 'master':
-# branch: 'master'
-# mvn-settings: 'msb-apigateway-settings'
-# files: '**'
-# archive-artifacts: ''
-# build-node: ubuntu1804-docker-arm64-4c-2g
-#
- project:
name: msb-apigateway-sonar
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
build-node: ubuntu1804-builder-4c-4g
- project: 'msb/apigateway'
- project-name: 'msb-apigateway'
- branch: 'master'
- mvn-settings: 'msb-apigateway-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ project: "msb/apigateway"
+ project-name: "msb-apigateway"
+ branch: "master"
+ mvn-settings: "msb-apigateway-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
- project:
name: msb-apigateway-clm
jobs:
- gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
+ nexus-iq-namespace: "onap-"
project: msb/apigateway
- project-name: 'msb-apigateway'
- branch: 'master'
- mvn-settings: 'msb-apigateway-settings'
+ project-name: "msb-apigateway"
+ branch: "master"
+ mvn-settings: "msb-apigateway-settings"
- project:
name: msb-apigateway-info
project-name: msb-apigateway
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: msb/apigateway
branch: master
diff --git a/jjb/msb/msb-discovery.yaml b/jjb/msb/msb-discovery.yaml
index 72fab4c..f5f4ca6 100644
--- a/jjb/msb/msb-discovery.yaml
+++ b/jjb/msb/msb-discovery.yaml
@@ -1,85 +1,66 @@
---
- project:
name: msb-discovery
- project-name: 'msb-discovery'
+ project-name: "msb-discovery"
jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
+ - "{project-name}-{stream}-verify-java"
+ - "{project-name}-{stream}-merge-java"
- gerrit-maven-stage:
+ sbom-generator: true
sign-artifacts: true
- build-node: centos7-builder-4c-4g
+ build-node: centos8-docker-4c-4g
maven-versions-plugin: true
- gerrit-maven-docker-stage:
+ sbom-generator: true
build-node: ubuntu1804-docker-8c-8g
maven-versions-plugin: true
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
- mvn-pom: 'distributions/msb-discovery/pom.xml'
- mvn-params: '-f distributions/msb-discovery/pom.xml -Dmaven.test.skip=true -P linux,docker'
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
- project: 'msb/discovery'
+ container-public-registry: "nexus3.onap.org:10001"
+ container-staging-registry: "nexus3.onap.org:10003"
+ mvn-pom: "distributions/msb-discovery/pom.xml"
+ mvn-params: "-f distributions/msb-discovery/pom.xml -Dmaven.test.skip=true -P linux,docker"
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
+ project: "msb/discovery"
stream:
- - 'master':
- branch: 'master'
- - 'istanbul':
- branch: 'istanbul'
- mvn-settings: 'msb-discovery-settings'
- files: '**'
- archive-artifacts: ''
+ - "master":
+ branch: "master"
+ mvn-settings: "msb-discovery-settings"
+ files: "**"
+ archive-artifacts: ""
build-node: ubuntu1804-builder-4c-4g
-#- project:
-# name: msb-discovery-arm64
-# project-name: 'msb-discovery-arm64'
-# jobs:
-# - '{project-name}-{stream}-docker-java-version-shell-daily':
-# docker-pom: 'pom.xml'
-# mvn-goals: 'install'
-# script:
-# !include-raw-escape: 'build-discovery-docker-image.sh'
-# build-node: ubuntu1804-docker-arm64-4c-2g
-# project: 'msb/discovery'
-# stream:
-# - 'master':
-# branch: 'master'
-# mvn-settings: 'msb-discovery-settings'
-# files: '**'
-# archive-artifacts: ''
-#
- project:
name: msb-discovery-sonar
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
build-node: ubuntu1804-builder-4c-4g
- project: 'msb/discovery'
- project-name: 'msb-discovery'
- branch: 'master'
- mvn-settings: 'msb-discovery-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ project: "msb/discovery"
+ project-name: "msb-discovery"
+ branch: "master"
+ mvn-settings: "msb-discovery-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
- project:
name: msb-discovery-clm
jobs:
- gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
+ nexus-iq-namespace: "onap-"
project: msb/discovery
- project-name: 'msb-discovery'
- branch: 'master'
- mvn-settings: 'msb-discovery-settings'
+ project-name: "msb-discovery"
+ branch: "master"
+ mvn-settings: "msb-discovery-settings"
- project:
name: msb-discovery-info
project-name: msb-discovery
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: msb/discovery
branch: master
diff --git a/jjb/msb/msb-java-sdk.yaml b/jjb/msb/msb-java-sdk.yaml
index 5c599c3..2f25b1e 100644
--- a/jjb/msb/msb-java-sdk.yaml
+++ b/jjb/msb/msb-java-sdk.yaml
@@ -1,23 +1,22 @@
---
- project:
name: msb-java-sdk
- project-name: 'msb-java-sdk'
+ project-name: "msb-java-sdk"
jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
+ - "{project-name}-{stream}-verify-java"
+ - "{project-name}-{stream}-merge-java"
- gerrit-maven-stage:
+ sbom-generator: true
sign-artifacts: true
- build-node: centos7-builder-4c-4g
+ build-node: centos8-docker-4c-4g
maven-versions-plugin: true
- project: 'msb/java-sdk'
+ project: "msb/java-sdk"
stream:
- - 'master':
- branch: 'master'
- - 'istanbul':
- branch: 'istanbul'
- mvn-settings: 'msb-java-sdk-settings'
- files: '**'
- archive-artifacts: ''
+ - "master":
+ branch: "master"
+ mvn-settings: "msb-java-sdk-settings"
+ files: "**"
+ archive-artifacts: ""
build-node: ubuntu1804-builder-4c-4g
- project:
@@ -25,34 +24,33 @@
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
build-node: ubuntu1804-builder-4c-4g
- project: 'msb/java-sdk'
- project-name: 'msb-java-sdk'
- branch: 'master'
- mvn-settings: 'msb-java-sdk-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ project: "msb/java-sdk"
+ project-name: "msb-java-sdk"
+ branch: "master"
+ mvn-settings: "msb-java-sdk-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
- project:
name: msb-java-sdk-clm
jobs:
- gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
+ nexus-iq-namespace: "onap-"
project: msb/java-sdk
- project-name: 'msb-java-sdk'
- branch: 'master'
- mvn-settings: 'msb-java-sdk-settings'
+ project-name: "msb-java-sdk"
+ branch: "master"
+ mvn-settings: "msb-java-sdk-settings"
- project:
name: msb-java-sdk-info
project-name: msb-java-sdk
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: msb/java-sdk
branch: master
diff --git a/jjb/msb/msb-swagger-sdk.yaml b/jjb/msb/msb-swagger-sdk.yaml
index 00ac8a1..c6c99d8 100644
--- a/jjb/msb/msb-swagger-sdk.yaml
+++ b/jjb/msb/msb-swagger-sdk.yaml
@@ -1,23 +1,22 @@
---
- project:
name: msb-swagger-sdk
- project-name: 'msb-swagger-sdk'
+ project-name: "msb-swagger-sdk"
jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
+ - "{project-name}-{stream}-verify-java"
+ - "{project-name}-{stream}-merge-java"
- gerrit-maven-stage:
+ sbom-generator: true
sign-artifacts: true
- build-node: centos7-builder-4c-4g
+ build-node: centos8-docker-4c-4g
maven-versions-plugin: true
- project: 'msb/swagger-sdk'
+ project: "msb/swagger-sdk"
stream:
- - 'master':
- branch: 'master'
- - 'istanbul':
- branch: 'istanbul'
- mvn-settings: 'msb-swagger-sdk-settings'
- files: '**'
- archive-artifacts: ''
+ - "master":
+ branch: "master"
+ mvn-settings: "msb-swagger-sdk-settings"
+ files: "**"
+ archive-artifacts: ""
build-node: ubuntu1804-builder-4c-4g
- project:
@@ -25,34 +24,33 @@
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
build-node: ubuntu1804-builder-4c-4g
- project: 'msb/swagger-sdk'
- project-name: 'msb-swagger-sdk'
- branch: 'master'
- mvn-settings: 'msb-swagger-sdk-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ project: "msb/swagger-sdk"
+ project-name: "msb-swagger-sdk"
+ branch: "master"
+ mvn-settings: "msb-swagger-sdk-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
- project:
name: msb-swagger-sdk-clm
jobs:
- gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
+ nexus-iq-namespace: "onap-"
project: msb/swagger-sdk
- project-name: 'msb-swagger-sdk'
- branch: 'master'
- mvn-settings: 'msb-swagger-sdk-settings'
+ project-name: "msb-swagger-sdk"
+ branch: "master"
+ mvn-settings: "msb-swagger-sdk-settings"
- project:
name: msb-swagger-sdk-info
project-name: msb-swagger-sdk
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: msb/swagger-sdk
branch: master
diff --git a/jjb/multicloud/multicloud-csit.yaml b/jjb/multicloud/multicloud-csit.yaml
index 274e4f4..5b87d5a 100644
--- a/jjb/multicloud/multicloud-csit.yaml
+++ b/jjb/multicloud/multicloud-csit.yaml
@@ -2,13 +2,13 @@
- project:
name: multicloud-csit
jobs:
- - '{project-name}-{stream}-verify-csit-{functionality}'
- - '{project-name}-{stream}-csit-{functionality}'
- project-name: 'multicloud'
- recipients: 'bin.yang@windriver.com'
- stream: 'master'
+ - "{project-name}-{stream}-verify-csit-{functionality}"
+ - "{project-name}-{stream}-csit-{functionality}"
+ project-name: "multicloud"
+ recipients: "bin.yang@windriver.com"
+ stream: "master"
functionality:
- - 'functionality1':
+ - "functionality1":
trigger_jobs:
- robot-options: ''
- branch: 'master'
+ robot-options: ""
+ branch: "master"
diff --git a/jjb/multicloud/multicloud-framework-java.yaml b/jjb/multicloud/multicloud-framework-java.yaml
index b786da6..eb665e7 100644
--- a/jjb/multicloud/multicloud-framework-java.yaml
+++ b/jjb/multicloud/multicloud-framework-java.yaml
@@ -1,131 +1,104 @@
---
- project:
name: multicloud-framework-java
- project-name: 'multicloud-framework'
- project: 'multicloud/framework'
+ project-name: "multicloud-framework"
+ project: "multicloud/framework"
stream:
- - 'master':
- branch: 'master'
+ - "master":
+ branch: "master"
java-version: openjdk11
- - 'guilin':
- branch: 'guilin'
- java-version: openjdk11
- mvn-settings: 'multicloud-framework-settings'
+ mvn-settings: "multicloud-framework-settings"
subproject:
- - 'multivimbroker':
- pom: 'multivimbroker/pom.xml'
- pattern: 'multivimbroker/**'
- - 'artifactbroker':
- pom: 'artifactbroker/pom.xml'
- pattern: 'artifactbroker/**'
+ - "multivimbroker":
+ pom: "multivimbroker/pom.xml"
+ pattern: "multivimbroker/**"
+ - "artifactbroker":
+ pom: "artifactbroker/pom.xml"
+ pattern: "artifactbroker/**"
jobs:
- gerrit-maven-stage:
+ sbom-generator: true
sign-artifacts: true
- build-node: centos7-builder-4c-4g
+ build-node: centos8-docker-4c-4g
maven-versions-plugin: true
- gerrit-maven-docker-stage:
+ sbom-generator: true
build-node: ubuntu1804-docker-8c-8g
maven-goals: install
- mvn-params: '-P docker'
+ mvn-params: "-P docker"
maven-versions-plugin: true
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
- - '{project-name}-{stream}-{subproject}-verify-java'
- - '{project-name}-{stream}-{subproject}-merge-java'
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
- files: '**'
- archive-artifacts: ''
+ container-public-registry: "nexus3.onap.org:10001"
+ container-staging-registry: "nexus3.onap.org:10003"
+ - "{project-name}-{stream}-verify-java"
+ - "{project-name}-{stream}-merge-java"
+ - "{project-name}-{stream}-{subproject}-verify-java"
+ - "{project-name}-{stream}-{subproject}-merge-java"
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
+ files: "**"
+ archive-artifacts: ""
build-node: ubuntu1804-builder-4c-4g
-#- project:
-# name: multicloud-framework-arm64-java
-# project-name: 'multicloud-framework-arm64'
-# project: 'multicloud/framework'
-# stream:
-# - 'master':
-# branch: 'master'
-# mvn-settings: 'multicloud-framework-settings'
-# subproject:
-# - 'multivimbroker':
-# pom: 'multivimbroker/pom.xml'
-# pattern: 'multivimbroker/**'
-# jobs:
-# - '{project-name}-{stream}-docker-java-version-shell-daily':
-# docker-pom: 'pom.xml'
-# mvn-goals: 'install'
-# script:
-# !include-raw-escape: 'build-multicloud-framework-docker-image.sh'
-# files: '**'
-# archive-artifacts: ''
-# build-node: ubuntu1804-docker-arm64-4c-2g
-#
- project:
name: multicloud-framework-multivimbroker-sonar
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
build-node: ubuntu1804-builder-4c-4g
- project: 'multicloud/framework'
- project-name: 'multicloud-framework-multivimbroker'
- branch: 'master'
- mvn-params: '-f multivimbroker/pom.xml'
- mvn-settings: 'multicloud-framework-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ project: "multicloud/framework"
+ project-name: "multicloud-framework-multivimbroker"
+ branch: "master"
+ mvn-params: "-f multivimbroker/pom.xml"
+ mvn-settings: "multicloud-framework-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
- project:
name: multicloud-framework-multivimbroker-clm
jobs:
- gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
+ nexus-iq-namespace: "onap-"
project: multicloud/framework
- project-name: 'multicloud-framework-multivimbroker'
+ project-name: "multicloud-framework-multivimbroker"
stream:
- - 'master':
- branch: 'master'
- mvn-params: '-f multivimbroker/pom.xml'
- mvn-settings: 'multicloud-framework-settings'
+ - "master":
+ branch: "master"
+ mvn-params: "-f multivimbroker/pom.xml"
+ mvn-settings: "multicloud-framework-settings"
- project:
name: multicloud-framework-artifactbroker-sonar
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
build-node: ubuntu1804-builder-4c-4g
- project: 'multicloud/framework'
- project-name: 'multicloud-framework-artifactbroker'
- branch: 'master'
+ project: "multicloud/framework"
+ project-name: "multicloud-framework-artifactbroker"
+ branch: "master"
java-version: openjdk11
- mvn-params: '-f artifactbroker/pom.xml'
- mvn-settings: 'multicloud-framework-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ mvn-params: "-f artifactbroker/pom.xml"
+ mvn-settings: "multicloud-framework-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
- project:
name: multicloud-framework-artifactbroker-clm
jobs:
- gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
+ nexus-iq-namespace: "onap-"
project: multicloud/framework
- project-name: 'multicloud-framework-artifactbroker'
+ project-name: "multicloud-framework-artifactbroker"
stream:
- - 'master':
- branch: 'master'
- - 'istanbul':
- branch: 'istanbul'
+ - "master":
+ branch: "master"
java-version: openjdk11
- mvn-params: '-f artifactbroker/pom.xml'
- mvn-settings: 'multicloud-framework-settings'
+ mvn-params: "-f artifactbroker/pom.xml"
+ mvn-settings: "multicloud-framework-settings"
diff --git a/jjb/multicloud/multicloud-framework-python.yaml b/jjb/multicloud/multicloud-framework-python.yaml
index 113bce7..412401d 100644
--- a/jjb/multicloud/multicloud-framework-python.yaml
+++ b/jjb/multicloud/multicloud-framework-python.yaml
@@ -1,18 +1,16 @@
---
- project:
name: multicloud-framework-python
- project-name: 'multicloud-framework'
- project: 'multicloud/framework'
+ project-name: "multicloud-framework"
+ project: "multicloud/framework"
stream:
- - 'master':
- branch: 'master'
- - 'guilin':
- branch: 'guilin'
- mvn-settings: 'multicloud-framework-settings'
- build-node: 'ubuntu1804-builder-4c-4g'
+ - "master":
+ branch: "master"
+ mvn-settings: "multicloud-framework-settings"
+ build-node: "ubuntu1804-builder-4c-4g"
subproject:
- - 'multivimbroker':
- path: 'multivimbroker'
- pattern: 'multivimbroker/**'
+ - "multivimbroker":
+ path: "multivimbroker"
+ pattern: "multivimbroker/**"
jobs:
- - '{project-name}-{stream}-{subproject}-verify-python'
+ - "{project-name}-{stream}-{subproject}-verify-python"
diff --git a/jjb/multicloud/multicloud-framework.yaml b/jjb/multicloud/multicloud-framework.yaml
index cec2f67..2a2733a 100644
--- a/jjb/multicloud/multicloud-framework.yaml
+++ b/jjb/multicloud/multicloud-framework.yaml
@@ -1,8 +1,9 @@
+---
- project:
name: multicloud-framework-info
project-name: multicloud-framework
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: multicloud/framework
branch: master
diff --git a/jjb/multicloud/multicloud-info.yaml b/jjb/multicloud/multicloud-info.yaml
index c1aa85e..9f39280 100644
--- a/jjb/multicloud/multicloud-info.yaml
+++ b/jjb/multicloud/multicloud-info.yaml
@@ -1,11 +1,10 @@
---
-
- project:
name: multicloud-info
project-name: multicloud
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: multicloud
branch: master
@@ -14,7 +13,7 @@
project-name: multicloud-windriver
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: multicloud/openstack/windriver
branch: master
@@ -23,7 +22,7 @@
project-name: multicloud-oom
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: multicloud/oom
branch: master
@@ -32,6 +31,6 @@
project-name: multicloud-k8s
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: multicloud/k8s
branch: master
diff --git a/jjb/multicloud/multicloud-k8s.yaml b/jjb/multicloud/multicloud-k8s.yaml
index 428535a..c1ca0e6 100644
--- a/jjb/multicloud/multicloud-k8s.yaml
+++ b/jjb/multicloud/multicloud-k8s.yaml
@@ -1,60 +1,32 @@
---
- project:
name: multicloud-k8s
- project-name: 'multicloud-k8s'
- path: 'src'
- golangver: 'golang114'
+ project-name: "multicloud-k8s"
+ path: "src"
+ golangver: "golang114"
jobs:
- - '{project-name}-{stream}-{subproject}-verify-python'
- - '{project-name}-{stream}-verify-golang'
- - '{project-name}-{stream}-merge-golang'
- - '{project-name}-{stream}-docker-golang-shell-daily':
- script:
- !include-raw-escape: 'build-multicloud-k8s-docker-image.sh'
- - '{project-name}-{stream}-{area}-verify-shell':
- disable-job: '{disable-kud}'
+ - "{project-name}-{stream}-{subproject}-verify-python"
+ - "{project-name}-{stream}-verify-golang"
+ - "{project-name}-{stream}-merge-golang"
+ - "{project-name}-{stream}-docker-golang-shell-daily":
+ script: !include-raw-escape: "build-multicloud-k8s-docker-image.sh"
+ - "{project-name}-{stream}-{area}-verify-shell":
+ disable-job: "{disable-kud}"
area: kud-deployment
build-timeout: 45
- script:
- !include-raw-escape: 'kud-deployment.sh'
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
- project: 'multicloud/k8s'
+ script: !include-raw-escape: "kud-deployment.sh"
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
+ project: "multicloud/k8s"
subproject:
- validation-scripts:
- path: '.'
- pattern: '**'
+ path: "."
+ pattern: "**"
stream:
- - 'master':
- branch: 'master'
- - 'honolulu':
- branch: 'honolulu'
- #KUD fixes are not backported to maintenance branches
- disable-kud: true
- mvn-settings: 'multicloud-k8s-settings'
+ - "master":
+ branch: "master"
+ mvn-settings: "multicloud-k8s-settings"
disable-kud: false
- files: '**'
- archive-artifacts: ''
+ files: "**"
+ archive-artifacts: ""
build-node: ubuntu1804-builder-4c-4g
-
-#- project:
-# name: multicloud-k8s-arm64
-# project-name: 'multicloud-k8s-arm64'
-# path: 'src/k8splugin'
-# golangver: 'golang114'
-# jobs:
-# - '{project-name}-{stream}-docker-golang-shell-daily':
-# script:
-# !include-raw-escape: 'build-multicloud-k8s-docker-image.sh'
-# project: 'multicloud/k8s'
-# subproject:
-# - validation-scripts:
-# path: '.'
-# pattern: '**'
-# stream:
-# - 'master':
-# branch: 'master'
-# mvn-settings: 'multicloud-k8s-settings'
-# files: '**'
-# archive-artifacts: ''
-# build-node: ubuntu1804-docker-arm64-4c-2g
diff --git a/jjb/multicloud/multicloud-openstack-fcaps-csit.yaml b/jjb/multicloud/multicloud-openstack-fcaps-csit.yaml
index e0e4656..5c5c819 100644
--- a/jjb/multicloud/multicloud-openstack-fcaps-csit.yaml
+++ b/jjb/multicloud/multicloud-openstack-fcaps-csit.yaml
@@ -2,14 +2,14 @@
- project:
name: multicloud-openstack-fcaps-csit
jobs:
- - '{project-name}-{stream}-verify-csit-{functionality}'
- - '{project-name}-{stream}-csit-{functionality}'
- project-name: 'multicloud-fcaps'
- recipients: 'bin.yang@windriver.com'
- stream: 'master'
+ - "{project-name}-{stream}-verify-csit-{functionality}"
+ - "{project-name}-{stream}-csit-{functionality}"
+ project-name: "multicloud-fcaps"
+ recipients: "bin.yang@windriver.com"
+ stream: "master"
functionality:
- - 'functionality1':
+ - "functionality1":
trigger_jobs:
- robot-options: ''
- branch: 'master'
+ robot-options: ""
+ branch: "master"
disabled: true
diff --git a/jjb/multicloud/multicloud-openstack-lenovo-csit.yaml b/jjb/multicloud/multicloud-openstack-lenovo-csit.yaml
deleted file mode 100644
index 92f21d2..0000000
--- a/jjb/multicloud/multicloud-openstack-lenovo-csit.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-#- project:
-# name: multicloud-openstack-lenovo-csit
-# jobs:
-# - '{project-name}-{stream}-verify-csit-{functionality}'
-# - '{project-name}-{stream}-csit-{functionality}'
-# project-name: 'multicloud-lenovo'
-# stream: 'master'
-# functionality:
-# - 'functionality1':
-# trigger_jobs: 'multicloud-openstack-master-docker-java-version-shell-daily'
-# robot-options: ''
-# branch: 'master'
diff --git a/jjb/multicloud/multicloud-openstack-starlingx-csit.yaml b/jjb/multicloud/multicloud-openstack-starlingx-csit.yaml
index 353b18f..93b9715 100644
--- a/jjb/multicloud/multicloud-openstack-starlingx-csit.yaml
+++ b/jjb/multicloud/multicloud-openstack-starlingx-csit.yaml
@@ -2,13 +2,13 @@
- project:
name: multicloud-openstack-starlingx-csit
jobs:
- - '{project-name}-{stream}-verify-csit-{functionality}'
- - '{project-name}-{stream}-csit-{functionality}'
- project-name: 'multicloud-starlingx'
- recipients: 'bin.yang@windriver.com'
- stream: 'master'
+ - "{project-name}-{stream}-verify-csit-{functionality}"
+ - "{project-name}-{stream}-csit-{functionality}"
+ project-name: "multicloud-starlingx"
+ recipients: "bin.yang@windriver.com"
+ stream: "master"
functionality:
- - 'functionality1':
+ - "functionality1":
trigger_jobs:
- robot-options: ''
- branch: 'master'
+ robot-options: ""
+ branch: "master"
diff --git a/jjb/multicloud/multicloud-openstack-vmware-csit.yaml b/jjb/multicloud/multicloud-openstack-vmware-csit.yaml
index f854f63..f23f68e 100644
--- a/jjb/multicloud/multicloud-openstack-vmware-csit.yaml
+++ b/jjb/multicloud/multicloud-openstack-vmware-csit.yaml
@@ -2,14 +2,14 @@
- project:
name: multicloud-openstack-vmware-csit
jobs:
- - '{project-name}-{stream}-verify-csit-{functionality}'
- - '{project-name}-{stream}-csit-{functionality}'
- project-name: 'multicloud-vmware'
- recipients: 'bin.yang@windriver.com'
- stream: 'master'
+ - "{project-name}-{stream}-verify-csit-{functionality}"
+ - "{project-name}-{stream}-csit-{functionality}"
+ project-name: "multicloud-vmware"
+ recipients: "bin.yang@windriver.com"
+ stream: "master"
functionality:
- - 'functionality1':
+ - "functionality1":
trigger_jobs:
- robot-options: ''
- branch: 'master'
+ robot-options: ""
+ branch: "master"
disabled: true
diff --git a/jjb/multicloud/multicloud-openstack-vmware-java.yaml b/jjb/multicloud/multicloud-openstack-vmware-java.yaml
index 0ce5372..eba77f4 100644
--- a/jjb/multicloud/multicloud-openstack-vmware-java.yaml
+++ b/jjb/multicloud/multicloud-openstack-vmware-java.yaml
@@ -1,92 +1,71 @@
---
- project:
name: multicloud-openstack-vmware-java
- project-name: 'multicloud-openstack-vmware'
- project: 'multicloud/openstack/vmware'
+ project-name: "multicloud-openstack-vmware"
+ project: "multicloud/openstack/vmware"
stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'multicloud-openstack-vmware-settings'
+ - "master":
+ branch: "master"
+ mvn-settings: "multicloud-openstack-vmware-settings"
subproject:
- - 'vio':
- pom: 'vio/pom.xml'
- pattern: 'vio/**'
+ - "vio":
+ pom: "vio/pom.xml"
+ pattern: "vio/**"
jobs:
- gerrit-maven-stage:
+ sbom-generator: true
sign-artifacts: true
- build-node: centos7-builder-4c-4g
+ build-node: centos8-docker-4c-4g
maven-versions-plugin: true
- gerrit-maven-docker-stage:
+ sbom-generator: true
build-node: ubuntu1804-docker-8c-8g
maven-goals: install
- mvn-params: '-P docker'
+ mvn-params: "-P docker"
maven-versions-plugin: true
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
- - '{project-name}-{stream}-{subproject}-verify-java'
- - '{project-name}-{stream}-{subproject}-merge-java'
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
- files: '**'
- archive-artifacts: ''
+ container-public-registry: "nexus3.onap.org:10001"
+ container-staging-registry: "nexus3.onap.org:10003"
+ - "{project-name}-{stream}-verify-java"
+ - "{project-name}-{stream}-merge-java"
+ - "{project-name}-{stream}-{subproject}-verify-java"
+ - "{project-name}-{stream}-{subproject}-merge-java"
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
+ files: "**"
+ archive-artifacts: ""
build-node: ubuntu1804-builder-4c-4g
disabled: true
-#- project:
-# name: multicloud-openstack-vmware-arm64-java
-# project-name: 'multicloud-openstack-vmware-arm64'
-# project: 'multicloud/openstack/vmware'
-# stream:
-# - 'master':
-# branch: 'master'
-# mvn-settings: 'multicloud-openstack-vmware-settings'
-# subproject:
-# - 'vio':
-# pom: 'vio/pom.xml'
-# pattern: 'vio/**'
-# jobs:
-# - '{project-name}-{stream}-docker-java-version-shell-daily':
-# docker-pom: 'pom.xml'
-# mvn-goals: 'install'
-# script:
-# !include-raw-escape: 'build-multicloud-openstack-vmware-docker-image.sh'
-# build-node: ubuntu1804-docker-arm64-4c-2g
-# files: '**'
-# archive-artifacts: ''
-#
- project:
name: multicloud-openstack-vmware-sonar
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
build-node: ubuntu1804-builder-4c-4g
- project: 'multicloud/openstack/vmware'
- project-name: 'multicloud-openstack-vmware'
- branch: 'master'
- mvn-settings: 'multicloud-openstack-vmware-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ project: "multicloud/openstack/vmware"
+ project-name: "multicloud-openstack-vmware"
+ branch: "master"
+ mvn-settings: "multicloud-openstack-vmware-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
disabled: true
- project:
name: multicloud-openstack-vmware-java-clm
jobs:
- gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
+ nexus-iq-namespace: "onap-"
project: multicloud/openstack/vmware
- project-name: 'multicloud-openstack-vmware'
- build-node: 'ubuntu1804-builder-4c-4g'
+ project-name: "multicloud-openstack-vmware"
+ build-node: "ubuntu1804-builder-4c-4g"
stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'multicloud-openstack-vmware-settings'
+ - "master":
+ branch: "master"
+ mvn-settings: "multicloud-openstack-vmware-settings"
disabled: true
- project:
@@ -94,7 +73,7 @@
project-name: multicloud-openstack-vmware
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: multicloud/openstack/vmware
branch: master
disabled: true
diff --git a/jjb/multicloud/multicloud-openstack-vmware-python.yaml b/jjb/multicloud/multicloud-openstack-vmware-python.yaml
index 45cccb1..fbc198e 100644
--- a/jjb/multicloud/multicloud-openstack-vmware-python.yaml
+++ b/jjb/multicloud/multicloud-openstack-vmware-python.yaml
@@ -1,17 +1,17 @@
---
- project:
name: multicloud-openstack-vmware-python
- project-name: 'multicloud-openstack-vmware'
- project: 'multicloud/openstack/vmware'
+ project-name: "multicloud-openstack-vmware"
+ project: "multicloud/openstack/vmware"
stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'multicloud-openstack-vmware-settings'
- build-node: 'ubuntu1804-builder-4c-4g'
+ - "master":
+ branch: "master"
+ mvn-settings: "multicloud-openstack-vmware-settings"
+ build-node: "ubuntu1804-builder-4c-4g"
subproject:
- - 'vio':
- path: 'vio'
- pattern: 'vio/**'
+ - "vio":
+ path: "vio"
+ pattern: "vio/**"
jobs:
- - '{project-name}-{stream}-{subproject}-verify-python'
+ - "{project-name}-{stream}-{subproject}-verify-python"
disabled: true
diff --git a/jjb/multicloud/multicloud-openstack.yaml b/jjb/multicloud/multicloud-openstack.yaml
index 088b1f1..7b4bdd6 100644
--- a/jjb/multicloud/multicloud-openstack.yaml
+++ b/jjb/multicloud/multicloud-openstack.yaml
@@ -7,227 +7,150 @@
- project:
name: multicloud-openstack
- project-name: 'multicloud-openstack'
- project: 'multicloud/openstack'
+ project-name: "multicloud-openstack"
+ project: "multicloud/openstack"
stream:
- - 'master':
- branch: 'master'
- - 'elalto':
- branch: 'elalto'
- mvn-settings: 'multicloud-openstack-settings'
+ - "master":
+ branch: "master"
+ mvn-settings: "multicloud-openstack-settings"
subproject:
- - 'pike':
- path: 'pike'
- pattern: 'pike/**'
- pom: 'pike/pom.xml'
- - 'pike_share':
- path: 'pike'
- pattern: 'share/**'
- pom: 'pike/pom.xml'
- - 'starlingx':
- path: 'starlingx'
- pattern: 'starlingx/**'
- pom: 'starlingx/pom.xml'
- - 'starlingx_share':
- path: 'starlingx'
- pattern: 'share/**'
- pom: 'starlingx/pom.xml'
- - 'windriver':
- path: 'windriver'
- pattern: 'windriver/**'
- pom: 'windriver/pom.xml'
- - 'windriver_share':
- path: 'windriver'
- pattern: 'share/**'
- pom: 'windriver/pom.xml'
- - 'fcaps':
- path: 'fcaps'
- pattern: 'fcaps/**'
- pom: 'fcaps/pom.xml'
-# - 'lenovo':
-# path: 'lenovo'
-# pattern: 'lenovo/**'
-# pom: 'lenovo/pom.xml'
-# - 'lenovo_share':
-# path: 'lenovo'
-# pattern: 'share/**'
-# pom: 'lenovo/pom.xml'
- - 'hpa':
- path: 'hpa'
- pattern: 'hpa/**'
- pom: 'hpa/pom.xml'
- jobs:
- - '{project-name}-{stream}-{subproject}-verify-python'
- - '{project-name}-{stream}-{subproject}-verify-java'
- - '{project-name}-{stream}-{subproject}-merge-java'
- - gerrit-maven-stage:
- sign-artifacts: true
- build-node: centos7-builder-4c-4g
- maven-versions-plugin: true
- - gerrit-maven-docker-stage:
- build-node: centos7-docker-8c-8g
- maven-goals: install
- mvn-params: '-P docker'
- maven-versions-plugin: true
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
- files: '**'
- archive-artifacts: ''
- build-node: 'centos7-builder-4c-4g'
-
-#- project:
-# name: multicloud-openstack-arm64
-# project-name: 'multicloud-openstack-arm64'
-# project: 'multicloud/openstack'
-# stream:
-# - 'master':
-# branch: 'master'
-# mvn-settings: 'multicloud-openstack-settings'
-# jobs:
-# - '{project-name}-{stream}-docker-java-version-shell-daily':
-# docker-pom: 'pom.xml'
-# mvn-goals: 'install'
-# script:
-# !include-raw-escape: 'build-multicloud-openstack-docker-image.sh'
-# build-node: ubuntu1804-docker-arm64-4c-2g
-# files: '**'
-# archive-artifacts: ''
-#
+ - "pike":
+ path: "pike"
+ pattern: "pike/**"
+ pom: "pike/pom.xml"
+ - "pike_share":
+ path: "pike"
+ pattern: "share/**"
+ pom: "pike/pom.xml"
+ - "starlingx":
+ path: "starlingx"
+ pattern: "starlingx/**"
+ pom: "starlingx/pom.xml"
+ - "starlingx_share":
+ path: "starlingx"
+ pattern: "share/**"
+ pom: "starlingx/pom.xml"
+ - "windriver":
+ path: "windriver"
+ pattern: "windriver/**"
+ pom: "windriver/pom.xml"
+ - "windriver_share":
+ path: "windriver"
+ pattern: "share/**"
+ pom: "windriver/pom.xml"
+ - "fcaps":
+ path: "fcaps"
+ pattern: "fcaps/**"
+ pom: "fcaps/pom.xml"
- project:
name: multicloud-openstack-windriver-sonar
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
build-node: ubuntu1804-builder-4c-4g
- project: 'multicloud/openstack'
- project-name: 'multicloud-openstack-windriver'
- branch: 'master'
- mvn-params: '-f windriver/pom.xml'
- mvn-settings: 'multicloud-openstack-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ project: "multicloud/openstack"
+ project-name: "multicloud-openstack-windriver"
+ branch: "master"
+ mvn-params: "-f windriver/pom.xml"
+ mvn-settings: "multicloud-openstack-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
- project:
name: multicloud-openstack-pike-sonar
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
build-node: ubuntu1804-builder-4c-4g
- project: 'multicloud/openstack'
- project-name: 'multicloud-openstack-pike'
- branch: 'master'
- mvn-params: '-f pike/pom.xml'
- mvn-settings: 'multicloud-openstack-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ project: "multicloud/openstack"
+ project-name: "multicloud-openstack-pike"
+ branch: "master"
+ mvn-params: "-f pike/pom.xml"
+ mvn-settings: "multicloud-openstack-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
- project:
name: multicloud-openstack-starlingx-sonar
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
build-node: ubuntu1804-builder-4c-4g
- project: 'multicloud/openstack'
- project-name: 'multicloud-openstack-starlingx'
- branch: 'master'
- mvn-params: '-f starlingx/pom.xml'
- mvn-settings: 'multicloud-openstack-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ project: "multicloud/openstack"
+ project-name: "multicloud-openstack-starlingx"
+ branch: "master"
+ mvn-params: "-f starlingx/pom.xml"
+ mvn-settings: "multicloud-openstack-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
- project:
name: multicloud-openstack-clm
jobs:
- gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
+ nexus-iq-namespace: "onap-"
project: multicloud/openstack
- project-name: 'multicloud-openstack'
+ project-name: "multicloud-openstack"
build-node: ubuntu2004-memcached-4c-4g
stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'multicloud-openstack-settings'
+ - "master":
+ branch: "master"
+ mvn-settings: "multicloud-openstack-settings"
- project:
name: multicloud-openstack-fcaps-sonar
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
build-node: ubuntu1804-builder-4c-4g
- project: 'multicloud/openstack'
- project-name: 'multicloud-openstack-fcaps'
- branch: 'master'
- mvn-params: '-f fcaps/pom.xml'
- mvn-settings: 'multicloud-openstack-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-#- project:
-# name: multicloud-openstack-lenovo-sonar
-# jobs:
-# - gerrit-maven-sonar
- sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
-# cron: '@daily'
-# build-node: ubuntu1804-builder-4c-4g
-# project: 'multicloud/openstack'
-# project-name: 'multicloud-openstack-lenovo'
-# branch: 'master'
-# mvn-params: '-f lenovo/pom.xml'
-# mvn-settings: 'multicloud-openstack-settings'
-# mvn-goals: 'clean install'
-# mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ project: "multicloud/openstack"
+ project-name: "multicloud-openstack-fcaps"
+ branch: "master"
+ mvn-params: "-f fcaps/pom.xml"
+ mvn-settings: "multicloud-openstack-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
- project:
name: multicloud-openstack-hpa-sonar
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
build-node: ubuntu1804-builder-4c-4g
- project: 'multicloud/openstack'
- project-name: 'multicloud-openstack-hpa'
- branch: 'master'
- mvn-params: '-f hpa/pom.xml'
- mvn-settings: 'multicloud-openstack-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ project: "multicloud/openstack"
+ project-name: "multicloud-openstack-hpa"
+ branch: "master"
+ mvn-params: "-f hpa/pom.xml"
+ mvn-settings: "multicloud-openstack-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
- project:
name: multicloud-openstack-info
project-name: multicloud-openstack
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: multicloud/openstack
branch: master
diff --git a/jjb/music/music-distributed-kv-store-csit.yaml b/jjb/music/music-distributed-kv-store-csit.yaml
deleted file mode 100644
index ab49147..0000000
--- a/jjb/music/music-distributed-kv-store-csit.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-# Integration templates no longer support these
-# job definitions; if Music CSIT needs to be restored,
-# '{project-name}-review-verification-golang-{stream}'
-# '{project-name}-merge-verification-golag-{stream}'
-# would have to be added to integration templates and
-# applied here
-#
-#---
-#- project:
-# name: music-distributed-kv-store-csit
-# jobs:
-# - '{project-name}-{stream}-project-csit'
-# - '{project-name}-review-verification-{stream}'
-# - '{project-name}-merge-verification-{stream}'
-# project-name: 'music-distributed-kv-store'
-# project: 'music/distributed-kv-store'
-# disabled: true
-# stream: 'master'
-# artifact-type: 'golang'
-# java-version: openjdk11
-# mvn-version: 'mvn36'
-# mvn-settings: 'music-distributed-kv-store-settings'
-# mvn-global-settings: global-settings
-# robot-options: ''
-# branch: 'master'
diff --git a/jjb/music/music-distributed-kv-store.yaml b/jjb/music/music-distributed-kv-store.yaml
index 0985d66..8599268 100644
--- a/jjb/music/music-distributed-kv-store.yaml
+++ b/jjb/music/music-distributed-kv-store.yaml
@@ -1,22 +1,21 @@
---
- project:
name: music-distributed-kv-store
- project-name: 'music-distributed-kv-store'
- path: 'src/dkv'
+ project-name: "music-distributed-kv-store"
+ path: "src/dkv"
jobs:
- - '{project-name}-{stream}-verify-golang'
- - '{project-name}-{stream}-merge-golang'
- - '{project-name}-{stream}-docker-golang-shell-daily':
- script:
- !include-raw-escape: 'build-music-distributed-kv-store-image.sh'
- project: 'music/distributed-kv-store'
+ - "{project-name}-{stream}-verify-golang"
+ - "{project-name}-{stream}-merge-golang"
+ - "{project-name}-{stream}-docker-golang-shell-daily":
+ script: !include-raw-escape: "build-music-distributed-kv-store-image.sh"
+ project: "music/distributed-kv-store"
stream:
- - 'master':
- branch: 'master'
- artifact-type: 'golang'
- mvn-settings: 'music-distributed-kv-store-settings'
- files: '**'
- archive-artifacts: ''
+ - "master":
+ branch: "master"
+ artifact-type: "golang"
+ mvn-settings: "music-distributed-kv-store-settings"
+ files: "**"
+ archive-artifacts: ""
build-node: ubuntu1804-builder-4c-4g
- project:
@@ -24,6 +23,6 @@
project-name: music-distributed-kv-store
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: music/distributed-kv-store
branch: master
diff --git a/jjb/music/music-jar.yaml b/jjb/music/music-jar.yaml
index 1450e9c..7ec6146 100644
--- a/jjb/music/music-jar.yaml
+++ b/jjb/music/music-jar.yaml
@@ -1,42 +1,38 @@
---
- project:
name: music-jar
- project-name: 'music'
+ project-name: "music"
subproject:
- - 'music-jar':
- pom: 'jar/pom.xml'
- pattern: 'jar/**'
+ - "music-jar":
+ pom: "jar/pom.xml"
+ pattern: "jar/**"
jobs:
- - '{project-name}-{stream}-{subproject}-verify-java'
- - '{project-name}-{stream}-{subproject}-merge-java'
+ - "{project-name}-{stream}-{subproject}-verify-java"
+ - "{project-name}-{stream}-{subproject}-merge-java"
- gerrit-maven-stage:
+ sbom-generator: true
sign-artifacts: true
- build-node: centos7-builder-4c-4g
+ build-node: centos8-docker-4c-4g
maven-version-plugin: true
- mvn-pom: 'jar/pom.xml'
- mvn-params: '-f jar/pom.xml'
- pattern: 'jar/**'
- project: 'music'
+ mvn-pom: "jar/pom.xml"
+ mvn-params: "-f jar/pom.xml"
+ pattern: "jar/**"
+ project: "music"
stream:
- - 'jar-master':
- branch: 'master'
- - 'jar-casablanca':
- branch: 'casablanca'
- - 'jar-release-2.5.5':
- branch: 'release-2.5.5'
- mvn-settings: 'music-settings'
- files: '**'
- archive-artifacts: ''
+ - "jar-master":
+ branch: "master"
+ mvn-settings: "music-settings"
+ files: "**"
+ archive-artifacts: ""
build-node: ubuntu1804-builder-4c-4g
-
- project:
name: music-jar-clm
jobs:
- gerrit-maven-clm:
- mvn-params: '-f jar/pom.xml'
- nexus-iq-namespace: 'onap-'
+ mvn-params: "-f jar/pom.xml"
+ nexus-iq-namespace: "onap-"
project: music
- project-name: 'music-jar'
- branch: 'master'
- mvn-settings: 'music-settings'
+ project-name: "music-jar"
+ branch: "master"
+ mvn-settings: "music-settings"
diff --git a/jjb/onap-jjb/onap-pypi-template.yaml b/jjb/onap-jjb/onap-pypi-template.yaml
index 9de048c..557673d 100644
--- a/jjb/onap-jjb/onap-pypi-template.yaml
+++ b/jjb/onap-jjb/onap-pypi-template.yaml
@@ -1,6 +1,6 @@
---
# Job definition Anchors
-- pypi_job_boiler_plate: &pypi_job_boiler_plate
+- _pypi_job_boiler_plate: &pypi_job_boiler_plate
name: pypi_job_boiler_plate
#####################
@@ -18,7 +18,7 @@
gerrit_trigger_file_paths:
- compare-type: ANT
- pattern: '**'
+ pattern: "**"
submodule-disable: false
submodule-timeout: 10
@@ -28,44 +28,43 @@
#####################
project-type: freestyle
- node: '{build-node}'
+ node: "{build-node}"
parameters:
- lf-infra-parameters:
- project: '{project}'
- branch: '{branch}'
- stream: '{stream}'
- lftools-version: '{lftools-version}'
+ project: "{project}"
+ branch: "{branch}"
+ stream: "{stream}"
+ lftools-version: "{lftools-version}"
- lf-infra-tox-parameters:
- tox-dir: '{tox-dir}'
- tox-envs: '{tox-envs}'
-
+ tox-dir: "{tox-dir}"
+ tox-envs: "{tox-envs}"
properties:
- lf-infra-properties:
- build-days-to-keep: '{build-days-to-keep}'
+ build-days-to-keep: "{build-days-to-keep}"
scm:
- lf-infra-gerrit-scm:
- jenkins-ssh-credential: '{jenkins-ssh-credential}'
- git-url: '$GIT_URL/$PROJECT'
- refspec: '$GERRIT_REFSPEC'
- branch: '$GERRIT_BRANCH'
+ jenkins-ssh-credential: "{jenkins-ssh-credential}"
+ git-url: "$GIT_URL/$PROJECT"
+ refspec: "$GERRIT_REFSPEC"
+ branch: "$GERRIT_BRANCH"
submodule-recursive: true
- submodule-timeout: '{submodule-timeout}'
- submodule-disable: '{submodule-disable}'
+ submodule-timeout: "{submodule-timeout}"
+ submodule-disable: "{submodule-disable}"
choosing-strategy: default
wrappers:
- lf-infra-wrappers:
- build-timeout: '{build-timeout}'
- jenkins-ssh-credential: '{jenkins-ssh-credential}'
+ build-timeout: "{build-timeout}"
+ jenkins-ssh-credential: "{jenkins-ssh-credential}"
publishers:
- lf-infra-publish
- job-template:
- name: '{project-name}-python-staging-{stream}'
+ name: "{project-name}-python-staging-{stream}"
# Job template for PyPI staging jobs
# Daily Builds
@@ -74,32 +73,31 @@
triggers:
- gerrit:
- server-name: '{gerrit-server-name}'
- trigger-on: '{obj:gerrit_merge_triggers}'
+ server-name: "{gerrit-server-name}"
+ trigger-on: "{obj:gerrit_merge_triggers}"
projects:
- project-compare-type: ANT
- project-pattern: '{project}'
+ project-pattern: "{project}"
branches:
- branch-compare-type: ANT
- branch-pattern: '**/{branch}'
- file-paths: '{obj:gerrit_trigger_file_paths}'
+ branch-pattern: "**/{branch}"
+ file-paths: "{obj:gerrit_trigger_file_paths}"
builders:
- lf-infra-tox-install:
- python-version: '{python-version}'
+ python-version: "{python-version}"
- shell: !include-raw-escape: ../global-jjb/shell/tox-run.sh
- config-file-provider:
files:
- file-id: pypirc
- target: '$HOME/.pypirc'
- - shell:
- !include-raw-escape: ../../shell/pypi-dist-build.sh
+ target: "$HOME/.pypirc"
+ - shell: !include-raw-escape: ../../shell/pypi-dist-build.sh
- publish-pypi:
pypi-server: staging
- job-template:
- name: '{project-name}-python-release-{stream}'
+ name: "{project-name}-python-release-{stream}"
# Job template for PyPI release jobs
@@ -107,32 +105,31 @@
triggers:
- gerrit:
- server-name: '{gerrit-server-name}'
- trigger-on: '{obj:gerrit_release_trigger}'
+ server-name: "{gerrit-server-name}"
+ trigger-on: "{obj:gerrit_release_trigger}"
projects:
- project-compare-type: ANT
- project-pattern: '{project}'
+ project-pattern: "{project}"
branches:
- branch-compare-type: ANT
- branch-pattern: '**/{branch}'
- file-paths: '{obj:gerrit_trigger_file_paths}'
+ branch-pattern: "**/{branch}"
+ file-paths: "{obj:gerrit_trigger_file_paths}"
builders:
- lf-infra-tox-install:
- python-version: '{python-version}'
+ python-version: "{python-version}"
- shell: !include-raw-escape: ../global-jjb/shell/tox-run.sh
- config-file-provider:
files:
- file-id: pypirc
- target: '$HOME/.pypirc'
- - shell:
- !include-raw-escape: ../../shell/pypi-dist-build.sh
+ target: "$HOME/.pypirc"
+ - shell: !include-raw-escape: ../../shell/pypi-dist-build.sh
- publish-pypi:
pypi-server: release
- job-template:
- name: '{project-name}-{subproject}-python-staging-{stream}'
+ name: "{project-name}-{subproject}-python-staging-{stream}"
# Job template for PyPI staging jobs
# Daily Builds
@@ -141,32 +138,31 @@
triggers:
- gerrit:
- server-name: '{gerrit-server-name}'
- trigger-on: '{obj:gerrit_merge_triggers}'
+ server-name: "{gerrit-server-name}"
+ trigger-on: "{obj:gerrit_merge_triggers}"
projects:
- project-compare-type: ANT
- project-pattern: '{project}'
+ project-pattern: "{project}"
branches:
- branch-compare-type: ANT
- branch-pattern: '**/{branch}'
- file-paths: '{obj:gerrit_trigger_file_paths}'
+ branch-pattern: "**/{branch}"
+ file-paths: "{obj:gerrit_trigger_file_paths}"
builders:
- lf-infra-tox-install:
- python-version: '{python-version}'
+ python-version: "{python-version}"
- shell: !include-raw-escape: ../global-jjb/shell/tox-run.sh
- config-file-provider:
files:
- file-id: pypirc
- target: '$HOME/.pypirc'
- - shell:
- !include-raw-escape: ../../shell/pypi-dist-build.sh
+ target: "$HOME/.pypirc"
+ - shell: !include-raw-escape: ../../shell/pypi-dist-build.sh
- publish-pypi:
pypi-server: staging
- job-template:
- name: '{project-name}-{subproject}-python-release-{stream}'
+ name: "{project-name}-{subproject}-python-release-{stream}"
# Job template for PyPI release jobs
@@ -174,26 +170,25 @@
triggers:
- gerrit:
- server-name: '{gerrit-server-name}'
- trigger-on: '{obj:gerrit_release_trigger}'
+ server-name: "{gerrit-server-name}"
+ trigger-on: "{obj:gerrit_release_trigger}"
projects:
- project-compare-type: ANT
- project-pattern: '{project}'
+ project-pattern: "{project}"
branches:
- branch-compare-type: ANT
- branch-pattern: '**/{branch}'
- file-paths: '{obj:gerrit_trigger_file_paths}'
+ branch-pattern: "**/{branch}"
+ file-paths: "{obj:gerrit_trigger_file_paths}"
builders:
- lf-infra-tox-install:
- python-version: '{python-version}'
+ python-version: "{python-version}"
- shell: !include-raw-escape: ../global-jjb/shell/tox-run.sh
- config-file-provider:
files:
- file-id: pypirc
- target: '$HOME/.pypirc'
- - shell:
- !include-raw-escape: ../../shell/pypi-dist-build.sh
+ target: "$HOME/.pypirc"
+ - shell: !include-raw-escape: ../../shell/pypi-dist-build.sh
- publish-pypi:
pypi-server: release
diff --git a/jjb/oom-platform-cert-manager/oom-platform-cert-manager.yaml b/jjb/oom-platform-cert-manager/oom-platform-cert-manager.yaml
index f694051..7a5f037 100644
--- a/jjb/oom-platform-cert-manager/oom-platform-cert-manager.yaml
+++ b/jjb/oom-platform-cert-manager/oom-platform-cert-manager.yaml
@@ -9,6 +9,6 @@
name: oom-platform-cert-manager-info
project: oom/platform/cert-manager
project-name: oom-platform-cert-manager
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
jobs:
- gerrit-info-yaml-verify
diff --git a/jjb/oom-platform-cert-service/oom-platform-cert-service-csit.yaml b/jjb/oom-platform-cert-service/oom-platform-cert-service-csit.yaml
index 4cec290..46b1099 100644
--- a/jjb/oom-platform-cert-service/oom-platform-cert-service-csit.yaml
+++ b/jjb/oom-platform-cert-service/oom-platform-cert-service-csit.yaml
@@ -1,20 +1,19 @@
+---
# Note: 202003, LF says ubuntu1604 is deprecated. Use ubuntu1804 when needed
- project:
- name: oom-platform-cert-service-csit
- jobs:
- - "{project-name}-{stream}-verify-csit-{functionality}"
- - "{project-name}-{stream}-csit-{functionality}"
- project-name: "oom-platform-cert-service"
- stream:
- - "master":
- branch: "master"
- - "istanbul":
- branch: "istanbul"
- - "honolulu":
- branch: "honolulu"
- functionality:
- - "certservice":
- trigger_jobs:
- - "postprocessor":
- trigger_jobs:
- robot-options: ""
+ name: oom-platform-cert-service-csit
+ jobs:
+ - "{project-name}-{stream}-verify-csit-{functionality}"
+ - "{project-name}-{stream}-csit-{functionality}"
+ project-name: "oom-platform-cert-service"
+ stream:
+ - "master":
+ branch: "master"
+ - "kohn":
+ branch: "kohn"
+ functionality:
+ - "certservice":
+ trigger_jobs:
+ - "postprocessor":
+ trigger_jobs:
+ robot-options: ""
diff --git a/jjb/oom-platform-cert-service/oom-platform-cert-service.yaml b/jjb/oom-platform-cert-service/oom-platform-cert-service.yaml
index 249e16a..540746a 100644
--- a/jjb/oom-platform-cert-service/oom-platform-cert-service.yaml
+++ b/jjb/oom-platform-cert-service/oom-platform-cert-service.yaml
@@ -9,78 +9,76 @@
name: oom-platform-cert-service-info
project: oom/platform/cert-service
project-name: oom-platform-cert-service
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
jobs:
- gerrit-info-yaml-verify
- project:
- name: oom-platform-cert-service
- project-name: 'oom-platform-cert-service'
- stream:
- - 'master':
- branch: 'master'
- java-version: openjdk11
- - 'istanbul':
- branch: 'istanbul'
- java-version: openjdk11
- - 'honolulu':
- branch: 'honolulu'
- java-version: openjdk11
- project: 'oom/platform/cert-service'
- mvn-settings: 'oom-platform-cert-service-settings'
- files: '**'
- maven-deploy-properties: |
- deployAtEnd=true
- archive-artifacts: ''
- build-node: ubuntu1804-docker-8c-8g
- jobs:
- - '{project-name}-{stream}-verify-java':
- mvn-goals: 'clean install'
- - '{project-name}-{stream}-merge-java':
- mvn-goals: 'clean deploy'
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
- - gerrit-maven-stage:
- sign-artifacts: true
- build-node: centos7-docker-8c-8g
- maven-versions-plugin: true
- mvn-goals: 'clean deploy -P docker'
- - gerrit-maven-docker-stage:
- build-node: ubuntu1804-docker-8c-8g
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
- mvn-params: '-P docker -DskipTests=true -DskipNexusStagingDeployMojo=true -DskipDockerPush=false'
+ name: oom-platform-cert-service
+ project-name: "oom-platform-cert-service"
+ stream:
+ - "master":
+ branch: "master"
+ java-version: openjdk11
+ - "kohn":
+ branch: "kohn"
+ java-version: openjdk11
+ project: "oom/platform/cert-service"
+ mvn-settings: "oom-platform-cert-service-settings"
+ files: "**"
+ maven-deploy-properties: |
+ deployAtEnd=true
+ archive-artifacts: ""
+ build-node: ubuntu1804-docker-8c-8g
+ jobs:
+ - "{project-name}-{stream}-verify-java":
+ mvn-goals: "clean install"
+ - "{project-name}-{stream}-merge-java":
+ mvn-goals: "clean deploy"
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
+ - gerrit-maven-stage:
+ sbom-generator: true
+ sign-artifacts: true
+ build-node: centos8-docker-8c-8g
+ maven-versions-plugin: true
+ mvn-goals: "clean deploy -P docker"
+ - gerrit-maven-docker-stage:
+ sbom-generator: true
+ build-node: ubuntu1804-docker-8c-8g
+ container-public-registry: "nexus3.onap.org:10001"
+ container-staging-registry: "nexus3.onap.org:10003"
+ mvn-params: "-P docker -DskipTests=true -DskipNexusStagingDeployMojo=true -DskipDockerPush=false"
- project:
- name: oom-platform-cert-service-sonar
- subproject: 'oom-platform-cert-service'
- path: 'certService'
- java-version: openjdk11
- jobs:
- - gerrit-maven-sonar
- sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
- build-node: ubuntu1804-docker-8c-8g
- project: 'oom/platform/cert-service'
- project-name: 'oom-platform-cert-service'
- branch: 'master'
- mvn-settings: 'oom-platform-cert-service-settings'
- mvn-pom: 'certService/pom.xml'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ name: oom-platform-cert-service-sonar
+ subproject: "oom-platform-cert-service"
+ path: "certService"
+ java-version: openjdk11
+ jobs:
+ - gerrit-maven-sonar
+ sonarcloud: true
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
+ build-node: ubuntu1804-docker-8c-8g
+ project: "oom/platform/cert-service"
+ project-name: "oom-platform-cert-service"
+ branch: "master"
+ mvn-settings: "oom-platform-cert-service-settings"
+ mvn-pom: "certService/pom.xml"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
- project:
- name: oom-platform-cert-service-clm
- java-version: openjdk11
- jobs:
- - gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
- project: oom/platform/cert-service
- project-name: 'oom-platform-cert-service'
- branch: 'master'
- build-node: ubuntu1804-docker-8c-8g
- mvn-settings: 'oom-platform-cert-service-settings'
+ name: oom-platform-cert-service-clm
+ java-version: openjdk11
+ jobs:
+ - gerrit-maven-clm
+ nexus-iq-namespace: "onap-"
+ project: oom/platform/cert-service
+ project-name: "oom-platform-cert-service"
+ branch: "master"
+ build-node: ubuntu1804-docker-8c-8g
+ mvn-settings: "oom-platform-cert-service-settings"
diff --git a/jjb/oom-platform-keycloak/oom-platform-keycloak.yaml b/jjb/oom-platform-keycloak/oom-platform-keycloak.yaml
deleted file mode 100644
index 308dd5b..0000000
--- a/jjb/oom-platform-keycloak/oom-platform-keycloak.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-- project:
- name: oom-platform-keycloak-project-view
- project-name: oom-platform-keycloak
- views:
- - project-view
-
-- project:
- name: oom-platform-keycloak-info
- project: oom/platform/keycloak
- project-name: oom-platform-keycloak
- build-node: centos7-builder-2c-1g
- jobs:
- - gerrit-info-yaml-verify
diff --git a/jjb/oom-utils/oom-utils.yaml b/jjb/oom-utils/oom-utils.yaml
index 477d66e..fe55f15 100644
--- a/jjb/oom-utils/oom-utils.yaml
+++ b/jjb/oom-utils/oom-utils.yaml
@@ -9,6 +9,6 @@
name: oom-utils-info
project: oom/utils
project-name: oom-utils
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
jobs:
- gerrit-info-yaml-verify
diff --git a/jjb/oom/offline-installer.yaml b/jjb/oom/offline-installer.yaml
index 0c9b885..55e44ed 100644
--- a/jjb/oom/offline-installer.yaml
+++ b/jjb/oom/offline-installer.yaml
@@ -1,62 +1,62 @@
---
- project:
name: offline-installer
- project-name: 'offline-installer'
- build-node: 'ubuntu1804-docker-8c-8g'
+ project-name: "offline-installer"
+ build-node: "ubuntu1804-docker-8c-8g"
offline_review_bootstrap: !include-raw-escape: offline-installer-review-bootstrap.sh
stream:
- - 'master':
- branch: 'master'
- - 'jakarta':
- branch: 'jakarta'
+ - "master":
+ branch: "master"
+ - "kohn":
+ branch: "kohn"
jobs:
- - '{project-name}-{stream}-review':
- build_script: '{offline_review_bootstrap}'
+ - "{project-name}-{stream}-review":
+ build_script: "{offline_review_bootstrap}"
- project:
name: offline-installer-info
project-name: offline-installer
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: oom/offline-installer
branch: master
- project:
- name: offline-installer-linters
- project: oom/offline-installer
- project-name: offline-installer
- python-version: python3
- jobs:
- - integration-linters
- subproject:
- - 'py':
- tox-dir: '.'
- tox-envs: 'py'
- pattern: '**/*.py'
- stream:
- - 'master':
- branch: 'master'
- - 'jakarta':
- branch: 'jakarta'
+ name: offline-installer-linters
+ project: oom/offline-installer
+ project-name: offline-installer
+ python-version: python3
+ jobs:
+ - integration-linters
+ subproject:
+ - "py":
+ tox-dir: "."
+ tox-envs: "py"
+ pattern: "**/*.py"
+ stream:
+ - "master":
+ branch: "master"
+ - "kohn":
+ branch: "kohn"
- project:
- name: offline-installer-pytest
- project: oom/offline-installer
- project-name: offline-installer
- build-node: ubuntu1804-docker-8c-8g
- python-version: python3
- jobs:
- - integration-tox-verify
- subproject:
- - 'docker-downloader':
- tox-dir: 'build/download'
- tox-envs: 'pytest'
- pattern: 'build/download/**'
- stream:
- - 'master':
- branch: 'master'
- - 'jakarta':
- branch: 'jakarta'
+ name: offline-installer-pytest
+ project: oom/offline-installer
+ project-name: offline-installer
+ build-node: ubuntu1804-docker-8c-8g
+ python-version: python3
+ jobs:
+ - integration-tox-verify
+ subproject:
+ - "docker-downloader":
+ tox-dir: "build/download"
+ tox-envs: "pytest"
+ pattern: "build/download/**"
+ stream:
+ - "master":
+ branch: "master"
+ - "kohn":
+ branch: "kohn"
diff --git a/jjb/oom/oom-consul.yaml b/jjb/oom/oom-consul.yaml
index 4b7ec30..a660cee 100644
--- a/jjb/oom/oom-consul.yaml
+++ b/jjb/oom/oom-consul.yaml
@@ -9,57 +9,56 @@
name: oom-consul-info
project: oom/consul
project-name: oom-consul
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
jobs:
- gerrit-info-yaml-verify
- project:
- name: oom-consul-linters
- project: oom/consul
- project-name: oom-consul
- python-version: python3
- jobs:
- - oom-linters
- subproject:
- - 'yaml':
- tox-dir: '.'
- tox-envs: 'yaml'
- pattern: '**/*.yaml'
- - 'yml':
- tox-dir: '.'
- tox-envs: 'yaml'
- pattern: '**/*.yml'
- - 'py':
- tox-dir: '.'
- tox-envs: 'python'
- pattern: '**/*.python'
- stream:
- - 'master':
- branch: 'master'
-
+ name: oom-consul-linters
+ project: oom/consul
+ project-name: oom-consul
+ python-version: python3
+ jobs:
+ - oom-linters
+ subproject:
+ - "yaml":
+ tox-dir: "."
+ tox-envs: "yaml"
+ pattern: "**/*.yaml"
+ - "yml":
+ tox-dir: "."
+ tox-envs: "yaml"
+ pattern: "**/*.yml"
+ - "py":
+ tox-dir: "."
+ tox-envs: "python"
+ pattern: "**/*.python"
+ stream:
+ - "master":
+ branch: "master"
- project:
- name: oom-consul-release
- project-name: oom-consul
- project: oom/consul
- mvn-settings: 'oom-settings'
- jobs:
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
+ name: oom-consul-release
+ project-name: oom-consul
+ project: oom/consul
+ mvn-settings: "oom-settings"
+ jobs:
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
- project:
- name: 'oom-consul-docker'
+ name: "oom-consul-docker"
jobs:
- gerrit-docker-verify
- gerrit-docker-merge
- project-name: 'oom-consul'
- project: 'oom/consul'
+ project-name: "oom-consul"
+ project: "oom/consul"
stream:
- - 'master':
- branch: 'master'
- files: ''
- docker-name: 'onap/oom/consul'
- docker-build-args: '-f ./Dockerfile'
- docker-root: '$WORKSPACE'
- mvn-settings: 'oom-settings'
+ - "master":
+ branch: "master"
+ files: ""
+ docker-name: "onap/oom/consul"
+ docker-build-args: "-f ./Dockerfile"
+ docker-root: "$WORKSPACE"
+ mvn-settings: "oom-settings"
build-node: ubuntu1804-docker-8c-8g
diff --git a/jjb/oom/oom-helm.yaml b/jjb/oom/oom-helm.yaml
index 2d06faa..0f81426 100644
--- a/jjb/oom/oom-helm.yaml
+++ b/jjb/oom/oom-helm.yaml
@@ -3,53 +3,58 @@
name: oom
project-name: oom
project: oom
+ archive-artifacts: ""
mvn-settings: oom-settings
mvn-global-settings: global-settings
- archive-artifacts: ""
- build-node: ubuntu1804-helm-2c-1g
- pre_build_script: !include-raw-escape: shell/helm-repo-init.sh
- oom_build_script: |
- #!/bin/bash
- source helm.prop
- set -e -o pipefail
- cd kubernetes/
- make HELM_BIN=$HELM_BIN all
- oom_build_script_skip_lint: |
- #!/bin/bash
- source helm.prop
- set -e -o pipefail
- cd kubernetes/
- make HELM_BIN=$HELM_BIN SKIP_LINT=TRUE all
+ build-node: ubuntu2004-helm-2c-1g
+ helm_bin: helm3.8
+ pre_build_script: !include-raw-escape: shell/helm/helm-repo-init.sh
stream:
- "master":
branch: "master"
+ - "kohn":
+ branch: "kohn"
- "jakarta":
branch: "jakarta"
- - "istanbul":
- branch: "istanbul"
-
-
- helm_bin:
- - helm3.8
-
- exclude: []
- subproject: []
jobs:
- "{project-name}-{stream}-image-verify":
files: "**"
- "{project-name}-{stream}-verify-{helm_bin}":
- build_script: "{oom_build_script}"
- files: "kubernetes/**"
+ build_script: !include-raw-escape: shell/helm/make-helm-all.sh
+ files: "**/kubernetes/**"
build-timeout: 900
- "{project-name}-{stream}-merge-helm":
- build_script: "{oom_build_script}"
- post_build_script: !include-raw-escape: shell/publish_helm_charts.sh
- files: "**"
+ build_type: snapshot
+ build_script: !include-raw-escape: shell/helm/make-helm-all.sh
+ post_build_script: !include-raw-escape: shell/helm/publish_helm_charts.sh
+ files: "**/kubernetes/**"
build-timeout: 900
- "{project-name}-{stream}-release-helm":
- build_script: "{oom_build_script_skip_lint}"
- post_build_script: !include-raw-escape: shell/publish_helm_charts.sh
- files: "**"
+ build_type: release
+ build_script: !include-raw-escape: shell/helm/make-helm-skip-lint.sh
+ post_build_script: !include-raw-escape: shell/helm/publish_helm_charts.sh
+ files: "**/kubernetes/**"
+ build-timeout: 900
+
+- project:
+ name: oom-helm-verify-make-latest
+ project-name: oom
+ project: oom
+ archive-artifacts: ""
+ build-node: ubuntu2004-helm-2c-1g
+ helm_bin: helm3.10.2
+ pre_build_script: !include-raw-escape: shell/helm/helm-repo-init.sh
+
+ stream:
+ - "master":
+ branch: "master"
+ - "kohn":
+ branch: "kohn"
+
+ jobs:
+ - "{project-name}-{stream}-verify-make-{helm_bin}":
+ build_script: !include-raw-escape: shell/helm/make-helm-skip-lint.sh
+ files: "**/kubernetes/**"
build-timeout: 900
diff --git a/jjb/oom/oom-image-verify.yaml b/jjb/oom/oom-image-verify.yaml
index 8ac6e3a..7e30688 100644
--- a/jjb/oom/oom-image-verify.yaml
+++ b/jjb/oom/oom-image-verify.yaml
@@ -1,53 +1,53 @@
---
- job-template:
- name: '{project-name}-{stream}-image-verify'
+ name: "{project-name}-{stream}-image-verify"
concurrent: true
branch: master
submodule-recursive: true
- build_script: ''
- git-url: '$GIT_URL/$PROJECT'
- post_build_script: ''
- pre_build_script: ''
+ build_script: ""
+ git-url: "$GIT_URL/$PROJECT"
+ post_build_script: ""
+ pre_build_script: ""
submodule-disable: false
submodule-timeout: 10
project-type: freestyle
- node: '{build-node}'
+ node: "{build-node}"
properties:
- lf-infra-properties:
- build-days-to-keep: '{build-days-to-keep}'
+ build-days-to-keep: "{build-days-to-keep}"
parameters:
- lf-infra-parameters:
- branch: '{branch}'
- project: '{project}'
- stream: '{stream}'
- lftools-version: '{lftools-version}'
+ branch: "{branch}"
+ project: "{project}"
+ stream: "{stream}"
+ lftools-version: "{lftools-version}"
wrappers:
- lf-infra-wrappers:
- build-timeout: '{build-timeout}'
- jenkins-ssh-credential: '{jenkins-ssh-credential}'
+ build-timeout: "{build-timeout}"
+ jenkins-ssh-credential: "{jenkins-ssh-credential}"
publishers:
- lf-infra-publish
scm:
- gerrit-trigger-scm:
- refspec: '$GERRIT_REFSPEC'
- choosing-strategy: 'gerrit'
- submodule-recursive: '{submodule-recursive}'
+ refspec: "$GERRIT_REFSPEC"
+ choosing-strategy: "gerrit"
+ submodule-recursive: "{submodule-recursive}"
triggers:
- gerrit-trigger-helm-patch-submitted:
- status-context: '{project}-Helm-Verify'
- server: '{server-name}'
- project: '{project}'
- branch: '{branch}'
- files: '{files}'
+ status-context: "{project}-Helm-Verify"
+ server: "{server-name}"
+ project: "{project}"
+ branch: "{branch}"
+ files: "{files}"
builders:
- lf-infra-pre-build
- - shell: 'cd kubernetes; make check-for-staging-images 2>&1'
+ - shell: "cd kubernetes; make check-for-staging-images 2>&1"
diff --git a/jjb/oom/oom-jobs.yaml b/jjb/oom/oom-jobs.yaml
index 5f95f70..ea15297 100644
--- a/jjb/oom/oom-jobs.yaml
+++ b/jjb/oom/oom-jobs.yaml
@@ -1,34 +1,33 @@
---
- job-template:
- name: '{project-name}-{stream}-review'
- node: '{build-node}'
+ name: "{project-name}-{stream}-review"
+ node: "{build-node}"
project-type: freestyle
- build_script: ''
- pattern: '**'
+ build_script: ""
+ pattern: "**"
parameters:
- lf-infra-parameters:
- branch: '{branch}'
- project: 'oom/{project-name}'
- stream: '{stream}'
- lftools-version: '{lftools-version}'
+ branch: "{branch}"
+ project: "oom/{project-name}"
+ stream: "{stream}"
+ lftools-version: "{lftools-version}"
scm:
- gerrit-trigger-scm:
- refspec: '$GERRIT_REFSPEC'
- submodule-recursive: '{submodule-recursive}'
- choosing-strategy: 'gerrit'
+ refspec: "$GERRIT_REFSPEC"
+ submodule-recursive: "{submodule-recursive}"
+ choosing-strategy: "gerrit"
triggers:
- gerrit-trigger-patch-submitted:
- server: '{server-name}'
- project: 'oom/{project-name}'
- branch: '{branch}'
- files: '{obj:pattern}'
+ server: "{server-name}"
+ project: "oom/{project-name}"
+ branch: "{branch}"
+ files: "{obj:pattern}"
builders:
- - shell: '{obj:build_script}'
+ - shell: "{obj:build_script}"
publishers:
- lf-infra-publish
-
diff --git a/jjb/oom/oom-main-linter.yaml b/jjb/oom/oom-main-linter.yaml
index b6653d4..21e6706 100644
--- a/jjb/oom/oom-main-linter.yaml
+++ b/jjb/oom/oom-main-linter.yaml
@@ -1,3 +1,4 @@
+---
- project:
name: oom-main-linters
project: oom
@@ -30,7 +31,7 @@
stream:
- "master":
branch: "master"
- - "istanbul":
- branch: "istanbul"
+ - "kohn":
+ branch: "kohn"
- "jakarta":
branch: "jakarta"
diff --git a/jjb/oom/oom-oneclick-config.yaml b/jjb/oom/oom-oneclick-config.yaml
index 8defb44..670d1fa 100644
--- a/jjb/oom/oom-oneclick-config.yaml
+++ b/jjb/oom/oom-oneclick-config.yaml
@@ -6,27 +6,27 @@
- project-view
- project:
- name: oomconfig
- project-name: 'oomconfig'
- project: 'oom'
+ name: oomconfig
+ project-name: "oomconfig"
+ project: "oom"
- files: '**'
- archive-artifacts: ''
- build-timeout: 60
- build-node: ubuntu1804-docker-8c-8g
- submodule-recursive: true
+ files: "**"
+ archive-artifacts: ""
+ build-timeout: 60
+ build-node: ubuntu1804-docker-8c-8g
+ submodule-recursive: true
- jobs:
- - '{project}-{stream}-release-config'
- stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'oom-settings'
+ jobs:
+ - "{project}-{stream}-release-config"
+ stream:
+ - "master":
+ branch: "master"
+ mvn-settings: "oom-settings"
- job-template:
- name: '{project}-{stream}-release-config'
+ name: "{project}-{stream}-release-config"
project-type: freestyle
- node: '{build-node}'
+ node: "{build-node}"
properties:
- infra-properties:
@@ -34,13 +34,13 @@
scm:
- gerrit-trigger-scm:
- refspec: 'refs/heads/master'
- choosing-strategy: 'gerrit'
- submodule-recursive: '{submodule-recursive}'
+ refspec: "refs/heads/master"
+ choosing-strategy: "gerrit"
+ submodule-recursive: "{submodule-recursive}"
wrappers:
- infra-wrappers:
- build-timeout: '{build-timeout}'
+ build-timeout: "{build-timeout}"
builders:
- docker-login
@@ -53,6 +53,6 @@
project-name: oomconfig
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: oom
branch: master
diff --git a/jjb/oom/oom-readiness.yaml b/jjb/oom/oom-readiness.yaml
index 5a8257b..c804841 100644
--- a/jjb/oom/oom-readiness.yaml
+++ b/jjb/oom/oom-readiness.yaml
@@ -4,58 +4,56 @@
project-name: oom-readiness
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: oom/readiness
branch: master
- project:
- name: oom-readiness-linters
- project: oom/readiness
- project-name: oom-readiness
- python-version: python3
- jobs:
- - oom-linters
- subproject:
- - 'yaml':
- tox-dir: '.'
- tox-envs: 'yaml'
- pattern: '**/*.yaml'
- - 'yml':
- tox-dir: '.'
- tox-envs: 'yaml'
- pattern: '**/*.yml'
- - 'py':
- tox-dir: '.'
- tox-envs: 'python'
- pattern: '**/*.python'
- stream:
- - 'master':
- branch: 'master'
- - 'jakarta':
- branch: 'jakarta'
+ name: oom-readiness-linters
+ project: oom/readiness
+ project-name: oom-readiness
+ python-version: python3
+ jobs:
+ - oom-linters
+ subproject:
+ - "yaml":
+ tox-dir: "."
+ tox-envs: "yaml"
+ pattern: "**/*.yaml"
+ - "yml":
+ tox-dir: "."
+ tox-envs: "yaml"
+ pattern: "**/*.yml"
+ - "py":
+ tox-dir: "."
+ tox-envs: "python"
+ pattern: "**/*.python"
+ stream:
+ - "master":
+ branch: "master"
- project:
name: oom-readiness-release
project-name: oom-readiness
project: oom/readiness
- mvn-settings: 'oom-settings'
+ mvn-settings: "oom-settings"
jobs:
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
- project:
- name: 'oom-readiness-docker'
+ name: "oom-readiness-docker"
jobs:
- gerrit-docker-verify
- gerrit-docker-merge
- project-name: 'oom-readiness'
- project: 'oom/readiness'
+ project-name: "oom-readiness"
+ project: "oom/readiness"
stream:
- - 'master':
- branch: 'master'
- files: ''
- docker-name: 'onap/oom/readiness'
- docker-build-args: '-f ./Dockerfile'
- docker-root: '$WORKSPACE'
- mvn-settings: 'oom-settings'
+ - "master":
+ branch: "master"
+ files: ""
+ docker-name: "onap/oom/readiness"
+ docker-build-args: "-f ./Dockerfile"
+ docker-root: "$WORKSPACE"
+ mvn-settings: "oom-settings"
build-node: ubuntu1804-docker-8c-8g
diff --git a/jjb/oom/oom-registrator.yaml b/jjb/oom/oom-registrator.yaml
index 93fabe7..64370f3 100644
--- a/jjb/oom/oom-registrator.yaml
+++ b/jjb/oom/oom-registrator.yaml
@@ -1,48 +1,50 @@
---
- project:
name: oom-registrator
- project-name: 'oom-registrator'
+ project-name: "oom-registrator"
jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
+ - "{project-name}-{stream}-verify-java"
+ - "{project-name}-{stream}-merge-java"
- gerrit-maven-stage:
+ sbom-generator: true
sign-artifacts: true
- build-node: centos7-builder-4c-4g
+ build-node: centos8-docker-4c-4g
maven-versions-plugin: true
- - '{project-name}-{stream}-release-version-java-daily'
+ - "{project-name}-{stream}-release-version-java-daily"
- gerrit-maven-docker-stage:
+ sbom-generator: true
build-node: ubuntu1804-docker-8c-8g
maven-versions-plugin: true
- mvn-pom: 'pom.xml'
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
- mvn-params: '-f pom.xml -Dmaven.test.skip=true -P linux,docker'
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
- project: 'oom/registrator'
+ mvn-pom: "pom.xml"
+ container-public-registry: "nexus3.onap.org:10001"
+ container-staging-registry: "nexus3.onap.org:10003"
+ mvn-params: "-f pom.xml -Dmaven.test.skip=true -P linux,docker"
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
+ project: "oom/registrator"
stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'oom-registrator-settings'
- files: '**'
- archive-artifacts: ''
+ - "master":
+ branch: "master"
+ mvn-settings: "oom-registrator-settings"
+ files: "**"
+ archive-artifacts: ""
build-node: ubuntu1804-builder-4c-4g
- project:
name: oom-registrator-clm
jobs:
- gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
+ nexus-iq-namespace: "onap-"
project: oom/registrator
- project-name: 'oom-registrator'
- branch: 'master'
- mvn-settings: 'oom-registrator-settings'
+ project-name: "oom-registrator"
+ branch: "master"
+ mvn-settings: "oom-registrator-settings"
- project:
name: oom-registrator-info
project-name: oom-registrator
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: oom/registrator
branch: master
diff --git a/jjb/oom/oom-templates.yaml b/jjb/oom/oom-templates.yaml
index 3134bef..fa4d55e 100644
--- a/jjb/oom/oom-templates.yaml
+++ b/jjb/oom/oom-templates.yaml
@@ -8,48 +8,48 @@
# tox-dir: Directory containing the project's tox.ini
# pattern: List of file patterns to scan
- name: '{project-name}-{stream}-{subproject}-lint'
+ name: "{project-name}-{stream}-{subproject}-lint"
id: oom-linters
project-type: freestyle
- description: 'Job intended for running linters with Tox and Coala'
+ description: "Job intended for running linters with Tox and Coala"
build-node: ubuntu1804-builder-4c-4g
- node: '{build-node}'
+ node: "{build-node}"
parameters:
- lf-infra-parameters:
- project: '{project}'
- stream: '{stream}'
- branch: '{branch}'
+ project: "{project}"
+ stream: "{stream}"
+ branch: "{branch}"
- lf-infra-tox-parameters:
- tox-dir: '{tox-dir}'
- tox-envs: '{tox-envs}'
+ tox-dir: "{tox-dir}"
+ tox-envs: "{tox-envs}"
properties:
- infra-properties:
- build-days-to-keep: '{build-days-to-keep}'
+ build-days-to-keep: "{build-days-to-keep}"
scm:
- gerrit-trigger-scm:
- refspec: '$GERRIT_REFSPEC'
- choosing-strategy: 'gerrit'
- submodule-recursive: '{submodule-recursive}'
+ refspec: "$GERRIT_REFSPEC"
+ choosing-strategy: "gerrit"
+ submodule-recursive: "{submodule-recursive}"
wrappers:
- infra-wrappers:
- build-timeout: '{build-timeout}'
+ build-timeout: "{build-timeout}"
triggers:
- gerrit-trigger-patch-submitted:
- server: '{server-name}'
- project: '{project}'
- branch: '{branch}'
- files: '{pattern}'
+ server: "{server-name}"
+ project: "{project}"
+ branch: "{branch}"
+ files: "{pattern}"
builders:
- lf-infra-tox-install:
- python-version: '{python-version}'
+ python-version: "{python-version}"
- lf-infra-tox-run:
- parallel: 'false'
+ parallel: "false"
publishers:
- lf-infra-publish
diff --git a/jjb/oparent/oparent.yaml b/jjb/oparent/oparent.yaml
index 513b73c..b6defdd 100644
--- a/jjb/oparent/oparent.yaml
+++ b/jjb/oparent/oparent.yaml
@@ -7,44 +7,45 @@
- project:
name: oparent
- project-name: 'oparent'
+ project-name: "oparent"
jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
+ - "{project-name}-{stream}-verify-java"
+ - "{project-name}-{stream}-merge-java"
- gerrit-maven-stage:
+ sbom-generator: true
sign-artifacts: true
- build-node: centos7-builder-4c-4g
+ build-node: centos8-docker-4c-4g
maven-versions-plugin: true
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
- project: 'oparent'
+ project: "oparent"
stream:
- - 'master':
- branch: 'master'
- - 'istanbul':
- branch: 'istanbul'
- mvn-settings: 'oparent-settings'
+ - "master":
+ branch: "master"
+ - "istanbul":
+ branch: "istanbul"
+ mvn-settings: "oparent-settings"
java-version: openjdk11
- files: '**'
- archive-artifacts: ''
+ files: "**"
+ archive-artifacts: ""
build-node: ubuntu1804-builder-4c-4g
- project:
name: oparent-clm
jobs:
- gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
+ nexus-iq-namespace: "onap-"
project: oparent
- project-name: 'oparent'
- branch: 'master'
- mvn-settings: 'oparent-settings'
+ project-name: "oparent"
+ branch: "master"
+ mvn-settings: "oparent-settings"
- project:
name: oparent-info
project-name: oparent
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: oparent
branch: master
diff --git a/jjb/openci/openci-onap-daily-jobs.yaml b/jjb/openci/openci-onap-daily-jobs.yaml
index 03b9be8..b8168c2 100644
--- a/jjb/openci/openci-onap-daily-jobs.yaml
+++ b/jjb/openci/openci-onap-daily-jobs.yaml
@@ -2,26 +2,26 @@
- project:
name: openci-onap
- project: '{name}'
+ project: "{name}"
stream:
- master:
- branch: '{stream}'
- gs-pathname: ''
+ branch: "{stream}"
+ gs-pathname: ""
disabled: false
jobs:
- - 'openci-onap-autorelease-daily-{stream}'
- - 'openci-onap-promote-daily-{stream}'
+ - "openci-onap-autorelease-daily-{stream}"
+ - "openci-onap-promote-daily-{stream}"
# This job gets triggered manually for the demo purposes.
#
# In prototype, either what this job does needs to be integrated to
# ONAP autorelease job or triggered by the upstream autorelease job.
- job-template:
- name: 'openci-onap-autorelease-daily-{stream}'
+ name: "openci-onap-autorelease-daily-{stream}"
- disabled: '{obj:disabled}'
+ disabled: "{obj:disabled}"
concurrent: false
@@ -31,19 +31,19 @@
- string:
name: PUBLISH_EVENT_TYPE
default: ArtifactPublishedEvent
- description: 'The type of the event this job publishes'
+ description: "The type of the event this job publishes"
- string:
name: PUBLISH_EVENT_ORIGIN
default: ONAP
- description: 'Originating community'
+ description: "Originating community"
- string:
name: ARTIFACT_LOCATION
default: https://url/to/artifact/on/onap/nexus/$BUILD_NUMBER
- description: 'The location of the artifact on ONAP Nexus'
+ description: "The location of the artifact on ONAP Nexus"
- string:
name: CONFIDENCE_LEVEL
default: "'autorelease': 'SUCCESS'"
- description: 'The confidence level the published artifact gained'
+ description: "The confidence level the published artifact gained"
wrappers:
- credentials-binding:
@@ -56,8 +56,7 @@
builders:
# this build step in the job executes create-ape.sh to construct the
# ArtifactPublishedEvent (ape) and publish it using the python utility
- - shell:
- !include-raw-escape: ./create-ape.sh
+ - shell: !include-raw-escape: ./create-ape.sh
# This job gets triggered by a ConfidenceLevelModifiedEvent published
# by OPNFV jobs so ONAP can promote the autorelease artifact even further.
@@ -65,9 +64,9 @@
# This job is created for the demo purposes and might not be there for
# the prototype.
- job-template:
- name: 'openci-onap-promote-daily-{stream}'
+ name: "openci-onap-promote-daily-{stream}"
- disabled: '{obj:disabled}'
+ disabled: "{obj:disabled}"
concurrent: false
@@ -76,6 +75,7 @@
triggers:
- jms-messaging:
provider-name: openci.activemq
+ # yamllint disable-line rule:line-length
selector: JMSType = 'ConfidenceLevelModifiedEvent' and JMSOrigin = 'OPNFV' and JMSScenario = 'k8-nosdn-onap-ha'
builders:
diff --git a/jjb/optf/optf-has-csit.yaml b/jjb/optf/optf-has-csit.yaml
index 5826805..1536ab0 100644
--- a/jjb/optf/optf-has-csit.yaml
+++ b/jjb/optf/optf-has-csit.yaml
@@ -1,17 +1,18 @@
+---
- project:
name: optf-has-csit
jobs:
- - '{project-name}-review-verification-maven-{stream}':
+ - "{project-name}-review-verification-maven-{stream}":
mvn-goals: clean install
- - '{project-name}-merge-verification-maven-{stream}':
+ - "{project-name}-merge-verification-maven-{stream}":
mvn-goals: clean install
project-name: optf-has
- recipients: 'snarayanan@research.att.com'
+ recipients: "snarayanan@research.att.com"
project: optf/has
stream:
- - 'master':
- branch: 'master'
- - 'jakarta':
- branch: 'jakarta'
- mvn-settings: 'optf-has-settings'
- robot-options: ''
+ - "master":
+ branch: "master"
+ - "jakarta":
+ branch: "jakarta"
+ mvn-settings: "optf-has-settings"
+ robot-options: ""
diff --git a/jjb/optf/optf-has.yaml b/jjb/optf/optf-has.yaml
index 8fcd743..e06bfb5 100644
--- a/jjb/optf/optf-has.yaml
+++ b/jjb/optf/optf-has.yaml
@@ -1,78 +1,79 @@
---
- project:
name: optf-has
- project-name: 'optf-has'
- project: 'optf/has'
+ project-name: "optf-has"
+ project: "optf/has"
stream:
- - 'master':
- branch: 'master'
- - 'jakarta':
- branch: 'jakarta'
- mvn-settings: 'optf-has-settings'
+ - "master":
+ branch: "master"
+ - "jakarta":
+ branch: "jakarta"
+ mvn-settings: "optf-has-settings"
subproject:
- - 'conductor':
- path: 'conductor'
- pattern: 'conductor/**'
- pom: 'pom.xml'
+ - "conductor":
+ path: "conductor"
+ pattern: "conductor/**"
+ pom: "pom.xml"
jobs:
- - '{project-name}-{stream}-{subproject}-verify-python':
+ - "{project-name}-{stream}-{subproject}-verify-python":
build-node: ubuntu1804-builder-4c-4g
- - '{project-name}-{stream}-{subproject}-merge-java':
+ - "{project-name}-{stream}-{subproject}-merge-java":
build-node: ubuntu1804-docker-8c-8g
- gerrit-maven-stage:
+ sbom-generator: true
sign-artifacts: true
- build-node: centos7-docker-8c-8g
+ build-node: centos8-docker-8c-8g
maven-versions-plugin: true
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
- gerrit-maven-docker-stage:
+ sbom-generator: true
build-node: ubuntu1804-docker-8c-8g
maven-versions-plugin: true
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
- docker-pom: 'conductor/pom.xml'
- mvn-params: '-Dmaven.test.skip=true -P docker'
+ container-public-registry: "nexus3.onap.org:10001"
+ container-staging-registry: "nexus3.onap.org:10003"
+ docker-pom: "conductor/pom.xml"
+ mvn-params: "-Dmaven.test.skip=true -P docker"
- files: '**'
- archive-artifacts: ''
- build-node: 'ubuntu1804-builder-4c-4g'
+ files: "**"
+ archive-artifacts: ""
+ build-node: "ubuntu1804-builder-4c-4g"
- project:
name: optf-has-sonar
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
build-node: ubuntu1804-docker-8c-8g
- project: 'optf/has'
- project-name: 'optf-has'
- branch: 'master'
- mvn-settings: 'optf-has-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ project: "optf/has"
+ project-name: "optf-has"
+ branch: "master"
+ mvn-settings: "optf-has-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
- project:
name: optf-has-clm
jobs:
- gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
+ nexus-iq-namespace: "onap-"
project: optf/has
- project-name: 'optf-has'
+ project-name: "optf-has"
build-node: ubuntu1804-docker-8c-8g
stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'optf-has-settings'
+ - "master":
+ branch: "master"
+ mvn-settings: "optf-has-settings"
- project:
name: optf-has-info
project-name: optf-has
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: optf/has
branch: master
diff --git a/jjb/optf/optf-osdf-csit.yaml b/jjb/optf/optf-osdf-csit.yaml
index 708e3e1..595c6d1 100644
--- a/jjb/optf/optf-osdf-csit.yaml
+++ b/jjb/optf/optf-osdf-csit.yaml
@@ -1,17 +1,18 @@
+---
- project:
name: optf-osdf-csit
jobs:
- - '{project-name}-review-verification-maven-{stream}':
+ - "{project-name}-review-verification-maven-{stream}":
mvn-goals: clean install
- - '{project-name}-merge-verification-maven-{stream}':
+ - "{project-name}-merge-verification-maven-{stream}":
mvn-goals: clean install
project-name: optf-osdf
- recipients: 'snarayanan@research.att.com'
+ recipients: "snarayanan@research.att.com"
project: optf/osdf
stream:
- - 'master':
- branch: 'master'
- - 'jakarta':
- branch: 'jakarta'
- mvn-settings: 'optf-osdf-settings'
- robot-options: ''
+ - "master":
+ branch: "master"
+ - "jakarta":
+ branch: "jakarta"
+ mvn-settings: "optf-osdf-settings"
+ robot-options: ""
diff --git a/jjb/optf/optf-osdf.yaml b/jjb/optf/optf-osdf.yaml
index 4fb02f3..0ed404c 100644
--- a/jjb/optf/optf-osdf.yaml
+++ b/jjb/optf/optf-osdf.yaml
@@ -1,79 +1,80 @@
---
- project:
name: optf-osdf
- project-name: 'optf-osdf'
- project: 'optf/osdf'
+ project-name: "optf-osdf"
+ project: "optf/osdf"
python-version: python3
stream:
- - 'master':
- branch: 'master'
- - 'jakarta':
- branch: 'jakarta'
- mvn-settings: 'optf-osdf-settings'
+ - "master":
+ branch: "master"
+ - "jakarta":
+ branch: "jakarta"
+ mvn-settings: "optf-osdf-settings"
subproject:
- - 'osdf':
- path: '.'
- pattern: '**'
- pom: 'pom.xml'
+ - "osdf":
+ path: "."
+ pattern: "**"
+ pom: "pom.xml"
jobs:
- - '{project-name}-{stream}-{subproject}-verify-python':
+ - "{project-name}-{stream}-{subproject}-verify-python":
build-node: ubuntu1804-builder-4c-4g
- - '{project-name}-{stream}-{subproject}-merge-java':
+ - "{project-name}-{stream}-{subproject}-merge-java":
build-node: ubuntu1804-docker-8c-8g
- gerrit-maven-stage:
+ sbom-generator: true
sign-artifacts: true
- build-node: centos7-docker-8c-8g
+ build-node: centos8-docker-8c-8g
maven-versions-plugin: true
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
- gerrit-maven-docker-stage:
+ sbom-generator: true
build-node: ubuntu1804-docker-8c-8g
maven-versions-plugin: true
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
- docker-pom: 'pom.xml'
- mvn-params: '-Dmaven.test.skip=true -P docker'
+ container-public-registry: "nexus3.onap.org:10001"
+ container-staging-registry: "nexus3.onap.org:10003"
+ docker-pom: "pom.xml"
+ mvn-params: "-Dmaven.test.skip=true -P docker"
- files: '**'
- archive-artifacts: ''
- build-node: 'ubuntu1804-builder-4c-4g'
+ files: "**"
+ archive-artifacts: ""
+ build-node: "ubuntu1804-builder-4c-4g"
- project:
name: optf-osdf-sonar
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
build-node: ubuntu1804-docker-8c-8g
- project: 'optf/osdf'
- project-name: 'optf-osdf'
- branch: 'master'
- mvn-settings: 'optf-osdf-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ project: "optf/osdf"
+ project-name: "optf-osdf"
+ branch: "master"
+ mvn-settings: "optf-osdf-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
- project:
name: optf-osdf-clm
jobs:
- gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
+ nexus-iq-namespace: "onap-"
project: optf/osdf
build-node: ubuntu1804-docker-8c-8g
- project-name: 'optf-osdf'
+ project-name: "optf-osdf"
stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'optf-osdf-settings'
+ - "master":
+ branch: "master"
+ mvn-settings: "optf-osdf-settings"
- project:
name: optf-osdf-info
project-name: optf-osdf
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: optf/osdf
branch: master
diff --git a/jjb/policy/policy-apex-pdp.yaml b/jjb/policy/policy-apex-pdp.yaml
index 296a4fe..9dd5957 100644
--- a/jjb/policy/policy-apex-pdp.yaml
+++ b/jjb/policy/policy-apex-pdp.yaml
@@ -7,43 +7,47 @@
- project:
name: policy-apex-pdp
- project-name: 'policy-apex-pdp'
+ project-name: "policy-apex-pdp"
jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java':
- docker-pom: 'pom.xml'
- mvn-profile: 'docker'
- mvn-params: "-P docker"
+ - "{project-name}-{stream}-verify-java"
+ - "{project-name}-{stream}-merge-java":
+ docker-pom: "pom.xml"
+ mvn-profile: "docker"
+ mvn-params: "-P docker"
- gerrit-maven-stage:
+ sbom-generator: true
sign-artifacts: true
- build-node: centos7-builder-4c-4g
+ build-node: centos8-docker-4c-4g
maven-versions-plugin: true
- mvn-params: '-Dmaven.test.skip=true'
+ mvn-params: "-Dmaven.test.skip=true"
- gerrit-maven-docker-stage:
+ sbom-generator: true
build-node: ubuntu1804-docker-8c-8g
maven-versions-plugin: true
- mvn-params: '-P docker -Dmaven.test.skip=true'
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
+ mvn-params: "-P docker -Dmaven.test.skip=true"
+ container-public-registry: "nexus3.onap.org:10001"
+ container-staging-registry: "nexus3.onap.org:10003"
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
- project: 'policy/apex-pdp'
+ project: "policy/apex-pdp"
stream:
- - 'master':
- branch: 'master'
- - 'honolulu':
- branch: 'honolulu'
- - 'istanbul':
- branch: 'istanbul'
- - 'jakarta':
- branch: 'jakarta'
- - 'kohn':
- branch: 'kohn'
- mvn-settings: 'policy-apex-pdp-settings'
+ - "master":
+ branch: "master"
+ - "honolulu":
+ branch: "honolulu"
+ - "istanbul":
+ branch: "istanbul"
+ - "jakarta":
+ branch: "jakarta"
+ - "kohn":
+ branch: "kohn"
+ - "london":
+ branch: "london"
+ mvn-settings: "policy-apex-pdp-settings"
java-version: openjdk11
- files: '**'
- archive-artifacts: ''
+ files: "**"
+ archive-artifacts: ""
build-node: ubuntu1804-docker-8c-8g
- project:
@@ -51,31 +55,30 @@
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
build-node: ubuntu1804-builder-4c-4g
- project: 'policy/apex-pdp'
- project-name: 'policy-apex-pdp'
- branch: 'master'
- mvn-settings: 'policy-apex-pdp-settings'
+ project: "policy/apex-pdp"
+ project-name: "policy-apex-pdp"
+ branch: "master"
+ mvn-settings: "policy-apex-pdp-settings"
java-version: openjdk11
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
- project:
name: policy-apex-pdp-clm
jobs:
- gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
+ nexus-iq-namespace: "onap-"
project: policy/apex-pdp
- project-name: 'policy-apex-pdp'
+ project-name: "policy-apex-pdp"
stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'policy-apex-pdp-settings'
+ - "master":
+ branch: "master"
+ mvn-settings: "policy-apex-pdp-settings"
java-version: openjdk11
- project:
@@ -83,6 +86,6 @@
project-name: policy-apex-pdp
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: policy/apex-pdp
branch: master
diff --git a/jjb/policy/policy-api.yaml b/jjb/policy/policy-api.yaml
index 49ca4c6..2a3641d 100644
--- a/jjb/policy/policy-api.yaml
+++ b/jjb/policy/policy-api.yaml
@@ -1,43 +1,47 @@
---
- project:
name: policy-api
- project-name: 'policy-api'
+ project-name: "policy-api"
jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java':
- docker-pom: 'pom.xml'
- mvn-params: '-P docker'
+ - "{project-name}-{stream}-verify-java"
+ - "{project-name}-{stream}-merge-java":
+ docker-pom: "pom.xml"
+ mvn-params: "-P docker"
build-node: ubuntu1804-docker-8c-8g
- gerrit-maven-stage:
+ sbom-generator: true
sign-artifacts: true
- build-node: centos7-builder-4c-4g
+ build-node: centos8-docker-4c-4g
maven-versions-plugin: true
- mvn-params: '-Dmaven.test.skip=true'
+ mvn-params: "-Dmaven.test.skip=true"
- gerrit-maven-docker-stage:
+ sbom-generator: true
build-node: ubuntu1804-docker-8c-8g
maven-versions-plugin: true
- mvn-params: '-P docker -Dmaven.test.skip=true'
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
+ mvn-params: "-P docker -Dmaven.test.skip=true"
+ container-public-registry: "nexus3.onap.org:10001"
+ container-staging-registry: "nexus3.onap.org:10003"
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
- project: 'policy/api'
+ project: "policy/api"
stream:
- - 'master':
- branch: 'master'
- - 'honolulu':
- branch: 'honolulu'
- - 'istanbul':
- branch: 'istanbul'
- - 'jakarta':
- branch: 'jakarta'
- - 'kohn':
- branch: 'kohn'
- mvn-settings: 'policy-api-settings'
+ - "master":
+ branch: "master"
+ - "honolulu":
+ branch: "honolulu"
+ - "istanbul":
+ branch: "istanbul"
+ - "jakarta":
+ branch: "jakarta"
+ - "kohn":
+ branch: "kohn"
+ - "london":
+ branch: "london"
+ mvn-settings: "policy-api-settings"
java-version: openjdk11
- files: '**'
- archive-artifacts: ''
+ files: "**"
+ archive-artifacts: ""
build-node: ubuntu1804-builder-4c-4g
- project:
@@ -45,31 +49,30 @@
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
build-node: ubuntu1804-builder-4c-4g
- project: 'policy/api'
- project-name: 'policy-api'
- branch: 'master'
- mvn-settings: 'policy-api-settings'
+ project: "policy/api"
+ project-name: "policy-api"
+ branch: "master"
+ mvn-settings: "policy-api-settings"
java-version: openjdk11
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
- project:
name: policy-api-clm
jobs:
- gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
+ nexus-iq-namespace: "onap-"
project: policy/api
- project-name: 'policy-api'
+ project-name: "policy-api"
stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'policy-api-settings'
+ - "master":
+ branch: "master"
+ mvn-settings: "policy-api-settings"
java-version: openjdk11
- project:
@@ -77,6 +80,6 @@
project-name: policy-api
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: policy/api
branch: master
diff --git a/jjb/policy/policy-clamp.yaml b/jjb/policy/policy-clamp.yaml
index bbc1ae5..74f403e 100644
--- a/jjb/policy/policy-clamp.yaml
+++ b/jjb/policy/policy-clamp.yaml
@@ -1,44 +1,48 @@
---
- project:
name: policy-clamp
- project-name: 'policy-clamp'
+ project-name: "policy-clamp"
jobs:
- gerrit-maven-stage:
- build-node: centos7-docker-8c-8g
+ build-node: centos8-docker-8c-8g
+ sbom-generator: true
maven-versions-plugin: true
sign-artifacts: true
- mvn-params: '-Dmaven.test.skip=true'
+ mvn-params: "-Dmaven.test.skip=true"
- gerrit-maven-docker-stage:
+ sbom-generator: true
build-node: ubuntu1804-docker-8c-8g
maven-versions-plugin: true
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
- mvn-params: '-Dmaven.test.skip=true -P docker'
- - '{project-name}-{stream}-verify-java':
- mvn-params: '-P docker'
+ container-public-registry: "nexus3.onap.org:10001"
+ container-staging-registry: "nexus3.onap.org:10003"
+ mvn-params: "-Dmaven.test.skip=true -P docker"
+ - "{project-name}-{stream}-verify-java":
+ mvn-params: "-P docker"
build-node: ubuntu1804-docker-8c-16g
- - '{project-name}-{stream}-merge-java':
+ - "{project-name}-{stream}-merge-java":
build-node: ubuntu1804-docker-8c-16g
- mvn-params: '-P docker'
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
+ mvn-params: "-P docker"
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
- project: 'policy/clamp'
+ project: "policy/clamp"
stream:
- - 'master':
- branch: 'master'
- - 'honolulu':
- branch: 'honolulu'
- - 'istanbul':
- branch: 'istanbul'
- - 'jakarta':
- branch: 'jakarta'
- - 'kohn':
- branch: 'kohn'
- mvn-settings: 'policy-clamp-settings'
+ - "master":
+ branch: "master"
+ - "honolulu":
+ branch: "honolulu"
+ - "istanbul":
+ branch: "istanbul"
+ - "jakarta":
+ branch: "jakarta"
+ - "kohn":
+ branch: "kohn"
+ - "london":
+ branch: "london"
+ mvn-settings: "policy-clamp-settings"
java-version: openjdk11
- files: '**'
- archive-artifacts: ''
+ files: "**"
+ archive-artifacts: ""
build-node: ubuntu1804-docker-8c-8g
- project:
@@ -46,31 +50,30 @@
jobs:
- gerrit-maven-sonar:
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
build-node: ubuntu1804-docker-8c-8g
- project: 'policy/clamp'
- project-name: 'policy-clamp'
- branch: 'master'
- mvn-settings: 'policy-clamp-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ project: "policy/clamp"
+ project-name: "policy-clamp"
+ branch: "master"
+ mvn-settings: "policy-clamp-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
java-version: openjdk11
- project:
name: policy-clamp-clm
jobs:
- gerrit-maven-clm:
- nexus-iq-namespace: 'onap-'
- project: 'policy/clamp'
- project-name: 'policy-clamp'
+ nexus-iq-namespace: "onap-"
+ project: "policy/clamp"
+ project-name: "policy-clamp"
stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'policy-clamp-settings'
+ - "master":
+ branch: "master"
+ mvn-settings: "policy-clamp-settings"
build-node: ubuntu1804-docker-8c-8g
java-version: openjdk11
@@ -79,6 +82,6 @@
project-name: policy-clamp
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: policy/clamp
branch: master
diff --git a/jjb/policy/policy-common.yaml b/jjb/policy/policy-common.yaml
index 3d21e06..3bf4aaa 100644
--- a/jjb/policy/policy-common.yaml
+++ b/jjb/policy/policy-common.yaml
@@ -1,34 +1,37 @@
---
- project:
name: policy-common
- project-name: 'policy-common'
+ project-name: "policy-common"
jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
+ - "{project-name}-{stream}-verify-java"
+ - "{project-name}-{stream}-merge-java"
- gerrit-maven-stage:
+ sbom-generator: true
sign-artifacts: true
- build-node: centos7-builder-4c-4g
+ build-node: centos8-docker-4c-4g
maven-versions-plugin: true
- mvn-params: '-Dmaven.test.skip=true'
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
+ mvn-params: "-Dmaven.test.skip=true"
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
- project: 'policy/common'
+ project: "policy/common"
stream:
- - 'master':
- branch: 'master'
- - 'honolulu':
- branch: 'honolulu'
- - 'istanbul':
- branch: 'istanbul'
- - 'jakarta':
- branch: 'jakarta'
- - 'kohn':
- branch: 'kohn'
- mvn-settings: 'policy-common-settings'
+ - "master":
+ branch: "master"
+ - "honolulu":
+ branch: "honolulu"
+ - "istanbul":
+ branch: "istanbul"
+ - "jakarta":
+ branch: "jakarta"
+ - "kohn":
+ branch: "kohn"
+ - "london":
+ branch: "london"
+ mvn-settings: "policy-common-settings"
java-version: openjdk11
- files: '**'
- archive-artifacts: ''
+ files: "**"
+ archive-artifacts: ""
build-node: ubuntu1804-builder-4c-4g
- project:
@@ -36,31 +39,30 @@
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
build-node: ubuntu1804-builder-4c-4g
- project: 'policy/common'
- project-name: 'policy-common'
- branch: 'master'
- mvn-settings: 'policy-common-settings'
+ project: "policy/common"
+ project-name: "policy-common"
+ branch: "master"
+ mvn-settings: "policy-common-settings"
java-version: openjdk11
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
- project:
name: policy-common-clm
jobs:
- gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
+ nexus-iq-namespace: "onap-"
project: policy/common
- project-name: 'policy-common'
+ project-name: "policy-common"
stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'policy-common-settings'
+ - "master":
+ branch: "master"
+ mvn-settings: "policy-common-settings"
java-version: openjdk11
- project:
@@ -68,6 +70,6 @@
project-name: policy-common
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: policy/common
branch: master
diff --git a/jjb/policy/policy-csit-jobs.yaml b/jjb/policy/policy-csit-jobs.yaml
index a7ae387..b42b402 100644
--- a/jjb/policy/policy-csit-jobs.yaml
+++ b/jjb/policy/policy-csit-jobs.yaml
@@ -1,47 +1,48 @@
+---
- job-template:
- name: '{project-name}-{stream}-project-csit-{functionality}'
- disabled: '{disabled}'
+ name: "{project-name}-{stream}-project-csit-{functionality}"
+ disabled: false
project-type: freestyle
- build-node: 'ubuntu1804-docker-8c-8g'
- node: '{build-node}'
- recipients: ''
- java-version: 'openjdk11'
+ build-node: "ubuntu1804-docker-8c-8g"
+ node: "{build-node}"
+ recipients: ""
+ java-version: "openjdk11"
python-version: python3
properties:
- lf-infra-properties:
- project: '{project}'
- build-days-to-keep: '{build-days-to-keep}'
+ project: "{project}"
+ build-days-to-keep: "{build-days-to-keep}"
parameters:
- infra-parameters:
- project: '{project}'
- branch: '{branch}'
- refspec: 'refs/heads/{branch}'
- artifacts: '{archive-artifacts}'
+ project: "{project}"
+ branch: "{branch}"
+ refspec: "refs/heads/{branch}"
+ artifacts: "{archive-artifacts}"
- integration-test-options:
- test-options: '{functionality}'
+ test-options: "{functionality}"
scm:
- gerrit-trigger-scm:
- refspec: '$GERRIT_REFSPEC'
- choosing-strategy: 'default'
- submodule-recursive: '{submodule-recursive}'
+ refspec: "$GERRIT_REFSPEC"
+ choosing-strategy: "default"
+ submodule-recursive: "{submodule-recursive}"
wrappers:
- lf-infra-wrappers:
- build-timeout: '{build-timeout}'
- jenkins-ssh-credential: '{jenkins-ssh-credential}'
+ build-timeout: "{build-timeout}"
+ jenkins-ssh-credential: "{jenkins-ssh-credential}"
triggers:
- - timed: '@daily'
+ - timed: "@daily"
- reverse:
- jobs: '{obj:trigger_jobs}'
+ jobs: "{obj:trigger_jobs}"
builders:
- lf-infra-pre-build
- lf-update-java-alternatives:
- java-version: '{java-version}'
+ java-version: "{java-version}"
- integration-run-project-test
publishers:
@@ -50,57 +51,57 @@
pass-if: 100.0
- lf-infra-publish
- email:
- recipients: '{recipients}'
+ recipients: "{recipients}"
notify-every-unstable-build: false
send-to-individuals: true
- job-template:
- name: '{project-name}-{stream}-project-csit-verify-{functionality}'
- disabled: '{disabled}'
+ name: "{project-name}-{stream}-project-csit-verify-{functionality}"
+ disabled: false
project-type: freestyle
- build-node: 'ubuntu1804-docker-8c-8g'
- node: '{build-node}'
- recipients: ''
- java-version: 'openjdk11'
+ build-node: "ubuntu1804-docker-8c-8g"
+ node: "{build-node}"
+ recipients: ""
+ java-version: "openjdk11"
python-version: python3
properties:
- lf-infra-properties:
- project: '{project}'
- build-days-to-keep: '{build-days-to-keep}'
+ project: "{project}"
+ build-days-to-keep: "{build-days-to-keep}"
parameters:
- infra-parameters:
- project: '{project}'
- branch: '{branch}'
- refspec: 'refs/heads/{branch}'
- artifacts: '{archive-artifacts}'
+ project: "{project}"
+ branch: "{branch}"
+ refspec: "refs/heads/{branch}"
+ artifacts: "{archive-artifacts}"
- integration-test-options:
- test-options: '{functionality}'
+ test-options: "{functionality}"
scm:
- gerrit-trigger-scm:
- refspec: '$GERRIT_REFSPEC'
- choosing-strategy: 'gerrit'
- submodule-recursive: '{submodule-recursive}'
+ refspec: "$GERRIT_REFSPEC"
+ choosing-strategy: "gerrit"
+ submodule-recursive: "{submodule-recursive}"
wrappers:
- lf-infra-wrappers:
- build-timeout: '{build-timeout}'
- jenkins-ssh-credential: '{jenkins-ssh-credential}'
+ build-timeout: "{build-timeout}"
+ jenkins-ssh-credential: "{jenkins-ssh-credential}"
triggers:
- gerrit-trigger-patch-submitted:
- server: '{server-name}'
- project: '{project}'
- branch: '{branch}'
- files: '**/csit/**'
+ server: "{server-name}"
+ project: "{project}"
+ branch: "{branch}"
+ files: "**/csit/**"
builders:
- lf-infra-pre-build
- lf-update-java-alternatives:
- java-version: '{java-version}'
+ java-version: "{java-version}"
- integration-run-project-test
publishers:
@@ -109,6 +110,6 @@
pass-if: 100.0
- lf-infra-publish
- email:
- recipients: '{recipients}'
+ recipients: "{recipients}"
notify-every-unstable-build: false
send-to-individuals: true
diff --git a/jjb/policy/policy-csit.yaml b/jjb/policy/policy-csit.yaml
index fdb74e9..f5e42e7 100644
--- a/jjb/policy/policy-csit.yaml
+++ b/jjb/policy/policy-csit.yaml
@@ -1,199 +1,233 @@
+---
- project:
name: policy-distribution-project-csit
jobs:
- - '{project-name}-{stream}-project-csit-verify-{functionality}'
- - '{project-name}-{stream}-project-csit-{functionality}'
- project-name: 'policy-distribution'
- recipients: 'ram_krishna.verma@bell.ca'
- project: 'policy/docker'
+ - "{project-name}-{stream}-project-csit-verify-{functionality}"
+ - "{project-name}-{stream}-project-csit-{functionality}"
+ project-name: "policy-distribution"
+ recipients: "ram_krishna.verma@bell.ca"
+ project: "policy/docker"
stream:
- - 'master':
- branch: 'master'
- - 'honolulu':
- branch: 'honolulu'
- - 'istanbul':
- branch: 'istanbul'
- - 'jakarta':
- branch: 'jakarta'
- - 'kohn':
- branch: 'kohn'
+ - "master":
+ branch: "master"
+ - "honolulu":
+ branch: "honolulu"
+ - "istanbul":
+ branch: "istanbul"
+ - "jakarta":
+ branch: "jakarta"
+ - "kohn":
+ branch: "kohn"
+ - "london":
+ branch: "london"
functionality:
- - 'distribution'
+ - "distribution"
trigger_jobs:
- - 'policy-distribution-{stream}-merge-java'
- - 'policy-docker-{stream}-merge-java'
+ - "policy-distribution-{stream}-merge-java"
+ - "policy-docker-{stream}-merge-java"
- project:
name: policy-xacml-pdp-project-csit
jobs:
- - '{project-name}-{stream}-project-csit-verify-{functionality}'
- - '{project-name}-{stream}-project-csit-{functionality}'
- project-name: 'policy-xacml-pdp'
- recipients: 'jrh3@att.com jorge.hernandez-herrero@att.com'
- project: 'policy/docker'
+ - "{project-name}-{stream}-project-csit-verify-{functionality}"
+ - "{project-name}-{stream}-project-csit-{functionality}"
+ project-name: "policy-xacml-pdp"
+ recipients: "jrh3@att.com jorge.hernandez-herrero@att.com"
+ project: "policy/docker"
stream:
- - 'master':
- branch: 'master'
- - 'honolulu':
- branch: 'honolulu'
- - 'istanbul':
- branch: 'istanbul'
- - 'jakarta':
- branch: 'jakarta'
- - 'kohn':
- branch: 'kohn'
+ - "master":
+ branch: "master"
+ - "honolulu":
+ branch: "honolulu"
+ - "istanbul":
+ branch: "istanbul"
+ - "jakarta":
+ branch: "jakarta"
+ - "kohn":
+ branch: "kohn"
+ - "london":
+ branch: "london"
functionality:
- - 'xacml-pdp'
+ - "xacml-pdp"
trigger_jobs:
- - 'policy-xacml-pdp-{stream}-merge-java'
- - 'policy-docker-{stream}-merge-java'
+ - "policy-xacml-pdp-{stream}-merge-java"
+ - "policy-docker-{stream}-merge-java"
- project:
name: policy-drools-applications-project-csit
jobs:
- - '{project-name}-{stream}-project-csit-verify-{functionality}'
- - '{project-name}-{stream}-project-csit-{functionality}'
- project-name: 'policy-drools-applications'
- recipients: 'jrh3@att.com jorge.hernandez-herrero@att.com'
- project: 'policy/docker'
+ - "{project-name}-{stream}-project-csit-verify-{functionality}"
+ - "{project-name}-{stream}-project-csit-{functionality}"
+ project-name: "policy-drools-applications"
+ recipients: "jrh3@att.com jorge.hernandez-herrero@att.com"
+ project: "policy/docker"
stream:
- - 'master':
- branch: 'master'
- - 'honolulu':
- branch: 'honolulu'
- - 'istanbul':
- branch: 'istanbul'
- - 'jakarta':
- branch: 'jakarta'
- - 'kohn':
- branch: 'kohn'
+ - "master":
+ branch: "master"
+ - "honolulu":
+ branch: "honolulu"
+ - "istanbul":
+ branch: "istanbul"
+ - "jakarta":
+ branch: "jakarta"
+ - "kohn":
+ branch: "kohn"
+ - "london":
+ branch: "london"
functionality:
- - 'drools-applications'
+ - "drools-applications"
trigger_jobs:
- - 'policy-drools-applications-{stream}-merge-java'
- - 'policy-docker-{stream}-merge-java'
+ - "policy-drools-applications-{stream}-merge-java"
+ - "policy-docker-{stream}-merge-java"
- project:
name: policy-drools-pdp-project-csit
jobs:
- - '{project-name}-{stream}-project-csit-verify-{functionality}'
- - '{project-name}-{stream}-project-csit-{functionality}'
- project-name: 'policy-drools-pdp'
- recipients: 'jrh3@att.com jorge.hernandez-herrero@att.com'
- project: 'policy/docker'
+ - "{project-name}-{stream}-project-csit-verify-{functionality}"
+ - "{project-name}-{stream}-project-csit-{functionality}"
+ project-name: "policy-drools-pdp"
+ recipients: "jrh3@att.com jorge.hernandez-herrero@att.com"
+ project: "policy/docker"
stream:
- - 'master':
- branch: 'master'
- - 'honolulu':
- branch: 'honolulu'
- - 'istanbul':
- branch: 'istanbul'
- - 'jakarta':
- branch: 'jakarta'
- - 'kohn':
- branch: 'kohn'
+ - "master":
+ branch: "master"
+ - "honolulu":
+ branch: "honolulu"
+ - "istanbul":
+ branch: "istanbul"
+ - "jakarta":
+ branch: "jakarta"
+ - "kohn":
+ branch: "kohn"
+ - "london":
+ branch: "london"
functionality:
- - 'drools-pdp'
+ - "drools-pdp"
trigger_jobs:
- - 'policy-drools-pdp-{stream}-merge-java'
- - 'policy-docker-{stream}-merge-java'
+ - "policy-drools-pdp-{stream}-merge-java"
+ - "policy-docker-{stream}-merge-java"
- project:
name: policy-apex-pdp-project-csit
jobs:
- - '{project-name}-{stream}-project-csit-verify-{functionality}'
- - '{project-name}-{stream}-project-csit-{functionality}'
- project-name: 'policy-apex-pdp'
- recipients: 'liam.fallon@est.tech ram_krishna.verma@bell.ca'
- project: 'policy/docker'
+ - "{project-name}-{stream}-project-csit-verify-{functionality}"
+ - "{project-name}-{stream}-project-csit-{functionality}"
+ project-name: "policy-apex-pdp"
+ recipients: "liam.fallon@est.tech ram_krishna.verma@bell.ca"
+ project: "policy/docker"
stream:
- - 'master':
- branch: 'master'
- - 'honolulu':
- branch: 'honolulu'
- - 'istanbul':
- branch: 'istanbul'
- - 'jakarta':
- branch: 'jakarta'
- - 'kohn':
- branch: 'kohn'
+ - "master":
+ branch: "master"
+ - "honolulu":
+ branch: "honolulu"
+ - "istanbul":
+ branch: "istanbul"
+ - "jakarta":
+ branch: "jakarta"
+ - "kohn":
+ branch: "kohn"
+ - "london":
+ branch: "london"
functionality:
- - 'apex-pdp'
+ - "apex-pdp"
trigger_jobs:
- - 'policy-apex-pdp-{stream}-merge-java'
- - 'policy-docker-{stream}-merge-java'
+ - "policy-apex-pdp-{stream}-merge-java"
+ - "policy-docker-{stream}-merge-java"
- project:
name: policy-pap-project-csit
jobs:
- - '{project-name}-{stream}-project-csit-verify-{functionality}'
- - '{project-name}-{stream}-project-csit-{functionality}'
- project-name: 'policy-pap'
- recipients: 'jrh3@att.com ram_krishna.verma@bell.ca'
- project: 'policy/docker'
+ - "{project-name}-{stream}-project-csit-verify-{functionality}"
+ - "{project-name}-{stream}-project-csit-{functionality}"
+ project-name: "policy-pap"
+ recipients: "jrh3@att.com ram_krishna.verma@bell.ca"
+ project: "policy/docker"
stream:
- - 'master':
- branch: 'master'
- - 'honolulu':
- branch: 'honolulu'
- - 'istanbul':
- branch: 'istanbul'
- - 'jakarta':
- branch: 'jakarta'
- - 'kohn':
- branch: 'kohn'
+ - "master":
+ branch: "master"
+ - "honolulu":
+ branch: "honolulu"
+ - "istanbul":
+ branch: "istanbul"
+ - "jakarta":
+ branch: "jakarta"
+ - "kohn":
+ branch: "kohn"
+ - "london":
+ branch: "london"
functionality:
- - 'pap'
+ - "pap"
trigger_jobs:
- - 'policy-pap-{stream}-merge-java'
- - 'policy-docker-{stream}-merge-java'
+ - "policy-pap-{stream}-merge-java"
+ - "policy-docker-{stream}-merge-java"
- project:
name: policy-api-project-csit
jobs:
- - '{project-name}-{stream}-project-csit-verify-{functionality}'
- - '{project-name}-{stream}-project-csit-{functionality}'
- project-name: 'policy-api'
- recipients: 'jrh3@att.com ram_krishna.verma@bell.ca'
- project: 'policy/docker'
+ - "{project-name}-{stream}-project-csit-verify-{functionality}"
+ - "{project-name}-{stream}-project-csit-{functionality}"
+ project-name: "policy-api"
+ recipients: "jrh3@att.com ram_krishna.verma@bell.ca"
+ project: "policy/docker"
stream:
- - 'master':
- branch: 'master'
- - 'honolulu':
- branch: 'honolulu'
- - 'istanbul':
- branch: 'istanbul'
- - 'jakarta':
- branch: 'jakarta'
- - 'kohn':
- branch: 'kohn'
+ - "master":
+ branch: "master"
+ - "honolulu":
+ branch: "honolulu"
+ - "istanbul":
+ branch: "istanbul"
+ - "jakarta":
+ branch: "jakarta"
+ - "kohn":
+ branch: "kohn"
+ - "london":
+ branch: "london"
functionality:
- - 'api'
+ - "api"
trigger_jobs:
- - 'policy-api-{stream}-merge-java'
- - 'policy-docker-{stream}-merge-java'
+ - "policy-api-{stream}-merge-java"
+ - "policy-docker-{stream}-merge-java"
- project:
name: policy-clamp-project-csit
jobs:
- - '{project-name}-{stream}-project-csit-verify-{functionality}'
- - '{project-name}-{stream}-project-csit-{functionality}'
- project-name: 'policy-clamp'
- recipients: 'jrh3@att.com ram_krishna.verma@bell.ca liam.fallon@est.tech ajith.sreekumar@est.tech pd1248@att.com'
- project: 'policy/docker'
+ - "{project-name}-{stream}-project-csit-verify-{functionality}"
+ - "{project-name}-{stream}-project-csit-{functionality}"
+ project-name: "policy-clamp"
+ recipients: "jrh3@att.com ram_krishna.verma@bell.ca liam.fallon@est.tech pd1248@att.com"
+ project: "policy/docker"
stream:
- - 'master':
- branch: 'master'
- - 'honolulu':
- branch: 'honolulu'
- - 'istanbul':
- branch: 'istanbul'
- - 'jakarta':
- branch: 'jakarta'
- - 'kohn':
- branch: 'kohn'
+ - "master":
+ branch: "master"
+ - "honolulu":
+ branch: "honolulu"
+ - "istanbul":
+ branch: "istanbul"
+ - "jakarta":
+ branch: "jakarta"
+ - "kohn":
+ branch: "kohn"
+ - "london":
+ branch: "london"
functionality:
- - 'clamp'
+ - "clamp"
trigger_jobs:
- - 'policy-clamp-{stream}-merge-java'
- - 'policy-docker-{stream}-merge-java'
+ - "policy-clamp-{stream}-merge-java"
+ - "policy-docker-{stream}-merge-java"
+
+- project:
+ name: policy-apex-pdp-postgres-project-csit
+ jobs:
+ - "{project-name}-{stream}-project-csit-verify-{functionality}"
+ - "{project-name}-{stream}-project-csit-{functionality}"
+ project-name: "policy-apex-pdp"
+ recipients: "jrh3@att.com ram_krishna.verma@bell.ca liam.fallon@est.tech pd1248@att.com"
+ project: "policy/docker"
+ stream:
+ - "master":
+ branch: "master"
+ functionality:
+ - "apex-pdp-postgres"
+ trigger_jobs:
+ - "policy-apex-pdp-{stream}-merge-java"
+ - "policy-docker-{stream}-merge-java"
diff --git a/jjb/policy/policy-distribution.yaml b/jjb/policy/policy-distribution.yaml
index 725dc9f..8b4e123 100644
--- a/jjb/policy/policy-distribution.yaml
+++ b/jjb/policy/policy-distribution.yaml
@@ -1,43 +1,47 @@
---
- project:
name: policy-distribution
- project-name: 'policy-distribution'
+ project-name: "policy-distribution"
jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java':
- docker-pom: 'pom.xml'
- mvn-params: '-P docker'
+ - "{project-name}-{stream}-verify-java"
+ - "{project-name}-{stream}-merge-java":
+ docker-pom: "pom.xml"
+ mvn-params: "-P docker"
build-node: ubuntu1804-docker-8c-8g
- gerrit-maven-stage:
+ sbom-generator: true
sign-artifacts: true
- build-node: centos7-builder-4c-4g
+ build-node: centos8-docker-4c-4g
maven-versions-plugin: true
- mvn-params: '-Dmaven.test.skip=true'
+ mvn-params: "-Dmaven.test.skip=true"
- gerrit-maven-docker-stage:
+ sbom-generator: true
build-node: ubuntu1804-docker-8c-8g
maven-versions-plugin: true
- mvn-params: '-P docker -Dmaven.test.skip=true'
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
+ mvn-params: "-P docker -Dmaven.test.skip=true"
+ container-public-registry: "nexus3.onap.org:10001"
+ container-staging-registry: "nexus3.onap.org:10003"
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
- project: 'policy/distribution'
+ project: "policy/distribution"
stream:
- - 'master':
- branch: 'master'
- - 'honolulu':
- branch: 'honolulu'
- - 'istanbul':
- branch: 'istanbul'
- - 'jakarta':
- branch: 'jakarta'
- - 'kohn':
- branch: 'kohn'
- mvn-settings: 'policy-distribution-settings'
+ - "master":
+ branch: "master"
+ - "honolulu":
+ branch: "honolulu"
+ - "istanbul":
+ branch: "istanbul"
+ - "jakarta":
+ branch: "jakarta"
+ - "kohn":
+ branch: "kohn"
+ - "london":
+ branch: "london"
+ mvn-settings: "policy-distribution-settings"
java-version: openjdk11
- files: '**'
- archive-artifacts: ''
+ files: "**"
+ archive-artifacts: ""
build-node: ubuntu1804-builder-4c-4g
- project:
@@ -45,31 +49,30 @@
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
build-node: ubuntu1804-builder-4c-4g
- project: 'policy/distribution'
- project-name: 'policy-distribution'
- branch: 'master'
- mvn-settings: 'policy-distribution-settings'
+ project: "policy/distribution"
+ project-name: "policy-distribution"
+ branch: "master"
+ mvn-settings: "policy-distribution-settings"
java-version: openjdk11
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
- project:
name: policy-distribution-clm
jobs:
- gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
+ nexus-iq-namespace: "onap-"
project: policy/distribution
- project-name: 'policy-distribution'
+ project-name: "policy-distribution"
stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'policy-distribution-settings'
+ - "master":
+ branch: "master"
+ mvn-settings: "policy-distribution-settings"
java-version: openjdk11
- project:
@@ -77,6 +80,6 @@
project-name: policy-distribution
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: policy/distribution
branch: master
diff --git a/jjb/policy/policy-docker-base-common.yaml b/jjb/policy/policy-docker-base-common.yaml
index 5626e58..7b646e8 100644
--- a/jjb/policy/policy-docker-base-common.yaml
+++ b/jjb/policy/policy-docker-base-common.yaml
@@ -1,56 +1,56 @@
---
- project:
name: policy-docker-base-common
- project-name: 'policy-docker'
+ project-name: "policy-docker"
jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java':
- docker-pom: 'pom.xml'
- mvn-profile: 'docker'
+ - "{project-name}-{stream}-verify-java"
+ - "{project-name}-{stream}-merge-java":
+ docker-pom: "pom.xml"
+ mvn-profile: "docker"
mvn-params: "-P docker"
build-node: ubuntu1804-docker-8c-8g
- gerrit-maven-docker-stage:
+ sbom-generator: true
build-node: ubuntu1804-docker-8c-8g
maven-versions-plugin: true
- mvn-params: '-P docker -Dmaven.test.skip=true'
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
- mvn-settings: 'policy-docker-settings'
+ mvn-params: "-P docker -Dmaven.test.skip=true"
+ container-public-registry: "nexus3.onap.org:10001"
+ container-staging-registry: "nexus3.onap.org:10003"
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
+ mvn-settings: "policy-docker-settings"
mvn-params: "-Djava.net.preferIPv4Stack=true -Djava.net.preferIPv6Addresses=false"
java-version: openjdk11
- project: 'policy/docker'
+ project: "policy/docker"
stream:
- - 'master':
- branch: 'master'
- - 'honolulu':
- branch: 'honolulu'
- - 'istanbul':
- branch: 'istanbul'
- - 'jakarta':
- branch: 'jakarta'
- - 'kohn':
- branch: 'kohn'
- mvn-settings: 'policy-docker-settings'
- mvn-params: "-Djava.net.preferIPv4Stack=true -Djava.net.preferIPv6Addresses=false"
- java-version: openjdk11
- files: '**'
- archive-artifacts: ''
+ - "master":
+ branch: "master"
+ - "honolulu":
+ branch: "honolulu"
+ - "istanbul":
+ branch: "istanbul"
+ - "jakarta":
+ branch: "jakarta"
+ - "kohn":
+ branch: "kohn"
+ - "london":
+ branch: "london"
+ files: "**"
+ archive-artifacts: ""
build-node: ubuntu1804-builder-4c-4g
- project:
name: policy-docker-clm
jobs:
- gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
+ nexus-iq-namespace: "onap-"
project: policy/docker
- project-name: 'policy-docker'
+ project-name: "policy-docker"
stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'policy-docker-settings'
+ - "master":
+ branch: "master"
+ mvn-settings: "policy-docker-settings"
mvn-params: "-Djava.net.preferIPv4Stack=true -Djava.net.preferIPv6Addresses=false"
java-version: openjdk11
@@ -59,6 +59,6 @@
project-name: policy-docker
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: policy/docker
branch: master
diff --git a/jjb/policy/policy-drools-applications.yaml b/jjb/policy/policy-drools-applications.yaml
index 35fc95b..41ec7e7 100644
--- a/jjb/policy/policy-drools-applications.yaml
+++ b/jjb/policy/policy-drools-applications.yaml
@@ -1,78 +1,86 @@
---
- project:
name: policy-drools-applications
- project-name: 'policy-drools-applications'
+ project-name: "policy-drools-applications"
jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java':
- docker-pom: 'pom.xml'
- mvn-profile: 'docker'
+ - "{project-name}-{stream}-verify-java"
+ - "{project-name}-{stream}-merge-java":
+ docker-pom: "pom.xml"
+ mvn-profile: "docker"
mvn-params: "-P docker -Djava.net.preferIPv4Stack=true -Djava.net.preferIPv6Addresses=false"
- gerrit-maven-stage:
+ sbom-generator: true
sign-artifacts: true
- build-node: centos7-builder-4c-4g
+ build-node: centos8-docker-4c-4g
maven-versions-plugin: true
- mvn-params: '-Dmaven.test.skip=true'
+ mvn-params: "-Dmaven.test.skip=true"
- gerrit-maven-docker-stage:
+ sbom-generator: true
build-node: ubuntu1804-docker-8c-8g
maven-versions-plugin: true
- mvn-params: '-P docker -Dmaven.test.skip=true'
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
+ mvn-params: "-P docker -Dmaven.test.skip=true"
+ container-public-registry: "nexus3.onap.org:10001"
+ container-staging-registry: "nexus3.onap.org:10003"
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
- project: 'policy/drools-applications'
+ project: "policy/drools-applications"
stream:
- - 'master':
- branch: 'master'
- - 'honolulu':
- branch: 'honolulu'
- - 'istanbul':
- branch: 'istanbul'
- - 'jakarta':
- branch: 'jakarta'
- - 'kohn':
- branch: 'kohn'
- mvn-settings: 'policy-drools-applications-settings'
+ - "master":
+ branch: "master"
+ - "honolulu":
+ branch: "honolulu"
+ - "istanbul":
+ branch: "istanbul"
+ - "jakarta":
+ branch: "jakarta"
+ - "kohn":
+ branch: "kohn"
+ - "london":
+ branch: "london"
+ mvn-settings: "policy-drools-applications-settings"
+ mvn-version: "mvn36"
+ maven-version: "mvn36"
java-version: openjdk11
- files: '**'
- archive-artifacts: ''
+ files: "**"
+ archive-artifacts: ""
build-node: ubuntu1804-docker-8c-8g
-
- project:
name: policy-drools-applications-sonar
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
build-node: ubuntu1804-builder-4c-4g
- project: 'policy/drools-applications'
- project-name: 'policy-drools-applications'
- branch: 'master'
- mvn-settings: 'policy-drools-applications-settings'
+ project: "policy/drools-applications"
+ project-name: "policy-drools-applications"
+ branch: "master"
+ mvn-settings: "policy-drools-applications-settings"
+ mvn-version: "mvn36"
+ maven-version: "mvn36"
java-version: openjdk11
- java-opts: '-Djava.net.preferIPv4Stack=true -Djava.net.preferIPv6Addresses=false'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ java-opts: "-Djava.net.preferIPv4Stack=true -Djava.net.preferIPv6Addresses=false"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
- project:
name: policy-drools-applications-clm
jobs:
- gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
+ nexus-iq-namespace: "onap-"
project: policy/drools-applications
- project-name: 'policy-drools-applications'
+ project-name: "policy-drools-applications"
stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'policy-drools-applications-settings'
+ - "master":
+ branch: "master"
+ mvn-settings: "policy-drools-applications-settings"
mvn-params: "-Djava.net.preferIPv4Stack=true -Djava.net.preferIPv6Addresses=false"
+ mvn-version: "mvn36"
+ maven-version: "mvn36"
java-version: openjdk11
build-node: ubuntu1804-docker-8c-8g
@@ -81,6 +89,6 @@
project-name: policy-drools-applications
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: policy/drools-applications
branch: master
diff --git a/jjb/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml
index 70ad1f1..8cb8f90 100644
--- a/jjb/policy/policy-drools-pdp.yaml
+++ b/jjb/policy/policy-drools-pdp.yaml
@@ -1,43 +1,47 @@
---
- project:
name: policy-drools-pdp
- project-name: 'policy-drools-pdp'
+ project-name: "policy-drools-pdp"
jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java':
- docker-pom: 'pom.xml'
- mvn-profile: 'docker'
+ - "{project-name}-{stream}-verify-java"
+ - "{project-name}-{stream}-merge-java":
+ docker-pom: "pom.xml"
+ mvn-profile: "docker"
mvn-params: "-P docker"
- gerrit-maven-stage:
+ sbom-generator: true
sign-artifacts: true
- build-node: centos7-builder-4c-4g
+ build-node: centos8-docker-4c-4g
maven-versions-plugin: true
- mvn-params: '-Dmaven.test.skip=true'
+ mvn-params: "-Dmaven.test.skip=true"
- gerrit-maven-docker-stage:
+ sbom-generator: true
build-node: ubuntu1804-docker-8c-8g
maven-versions-plugin: true
- mvn-params: '-P docker -Dmaven.test.skip=true'
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
+ mvn-params: "-P docker -Dmaven.test.skip=true"
+ container-public-registry: "nexus3.onap.org:10001"
+ container-staging-registry: "nexus3.onap.org:10003"
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
- project: 'policy/drools-pdp'
+ project: "policy/drools-pdp"
stream:
- - 'master':
- branch: 'master'
- - 'honolulu':
- branch: 'honolulu'
- - 'istanbul':
- branch: 'istanbul'
- - 'jakarta':
- branch: 'jakarta'
- - 'kohn':
- branch: 'kohn'
- mvn-settings: 'policy-drools-pdp-settings'
+ - "master":
+ branch: "master"
+ - "honolulu":
+ branch: "honolulu"
+ - "istanbul":
+ branch: "istanbul"
+ - "jakarta":
+ branch: "jakarta"
+ - "kohn":
+ branch: "kohn"
+ - "london":
+ branch: "london"
+ mvn-settings: "policy-drools-pdp-settings"
java-version: openjdk11
- files: '**'
- archive-artifacts: ''
+ files: "**"
+ archive-artifacts: ""
build-node: ubuntu1804-docker-8c-8g
- project:
@@ -45,32 +49,31 @@
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
build-node: ubuntu1804-builder-4c-4g
- project: 'policy/drools-pdp'
- project-name: 'policy-drools-pdp'
- branch: 'master'
- mvn-settings: 'policy-drools-pdp-settings'
+ project: "policy/drools-pdp"
+ project-name: "policy-drools-pdp"
+ branch: "master"
+ mvn-settings: "policy-drools-pdp-settings"
java-version: openjdk11
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
- project:
name: policy-drools-pdp-clm
jobs:
- gerrit-maven-clm:
- mvn-params: '-Dmaven.test.skip=true'
- nexus-iq-namespace: 'onap-'
+ mvn-params: "-Dmaven.test.skip=true"
+ nexus-iq-namespace: "onap-"
project: policy/drools-pdp
- project-name: 'policy-drools-pdp'
+ project-name: "policy-drools-pdp"
stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'policy-drools-pdp-settings'
+ - "master":
+ branch: "master"
+ mvn-settings: "policy-drools-pdp-settings"
java-version: openjdk11
- project:
@@ -78,6 +81,6 @@
project-name: policy-drools-pdp
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: policy/drools-pdp
branch: master
diff --git a/jjb/policy/policy-gui.yaml b/jjb/policy/policy-gui.yaml
index 175a79c..21b80f2 100644
--- a/jjb/policy/policy-gui.yaml
+++ b/jjb/policy/policy-gui.yaml
@@ -1,41 +1,45 @@
---
- project:
name: policy-gui
- project-name: 'policy-gui'
+ project-name: "policy-gui"
jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java':
- docker-pom: 'pom.xml'
- mvn-params: '-P docker'
+ - "{project-name}-{stream}-verify-java"
+ - "{project-name}-{stream}-merge-java":
+ docker-pom: "pom.xml"
+ mvn-params: "-P docker"
build-node: ubuntu1804-docker-8c-8g
- gerrit-maven-stage:
+ sbom-generator: true
sign-artifacts: true
- build-node: centos7-builder-4c-4g
+ build-node: centos8-docker-4c-4g
maven-versions-plugin: true
- mvn-params: '-Dmaven.test.skip=true'
+ mvn-params: "-Dmaven.test.skip=true"
- gerrit-maven-docker-stage:
+ sbom-generator: true
build-node: ubuntu1804-docker-8c-8g
maven-versions-plugin: true
- mvn-params: '-P docker -Dmaven.test.skip=true'
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
+ mvn-params: "-P docker -Dmaven.test.skip=true"
+ container-public-registry: "nexus3.onap.org:10001"
+ container-staging-registry: "nexus3.onap.org:10003"
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
- project: 'policy/gui'
+ project: "policy/gui"
stream:
- - 'master':
- branch: 'master'
- - 'istanbul':
- branch: 'istanbul'
- - 'jakarta':
- branch: 'jakarta'
- - 'kohn':
- branch: 'kohn'
- mvn-settings: 'policy-gui-settings'
+ - "master":
+ branch: "master"
+ - "istanbul":
+ branch: "istanbul"
+ - "jakarta":
+ branch: "jakarta"
+ - "kohn":
+ branch: "kohn"
+ - "london":
+ branch: "london"
+ mvn-settings: "policy-gui-settings"
java-version: openjdk11
- files: '**'
- archive-artifacts: ''
+ files: "**"
+ archive-artifacts: ""
build-node: ubuntu1804-builder-4c-4g
- project:
@@ -43,32 +47,31 @@
jobs:
- gerrit-maven-sonar-prescan-script
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
build-node: ubuntu1804-builder-4c-4g
- project: 'policy/gui'
- project-name: 'policy-gui'
- branch: 'master'
- mvn-settings: 'policy-gui-settings'
+ project: "policy/gui"
+ project-name: "policy-gui"
+ branch: "master"
+ mvn-settings: "policy-gui-settings"
java-version: openjdk11
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
sonar-prescan-script: !include-raw-escape: ../ubuntu-latest-nodejs.sh
- project:
name: policy-gui-clm
jobs:
- gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
+ nexus-iq-namespace: "onap-"
project: policy/gui
- project-name: 'policy-gui'
+ project-name: "policy-gui"
stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'policy-gui-settings'
+ - "master":
+ branch: "master"
+ mvn-settings: "policy-gui-settings"
java-version: openjdk11
- project:
@@ -76,6 +79,6 @@
project-name: policy-gui
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: policy/gui
branch: master
diff --git a/jjb/policy/policy-models.yaml b/jjb/policy/policy-models.yaml
index f3b44e6..e4daf05 100644
--- a/jjb/policy/policy-models.yaml
+++ b/jjb/policy/policy-models.yaml
@@ -1,43 +1,47 @@
---
- project:
name: policy-models
- project-name: 'policy-models'
+ project-name: "policy-models"
jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java':
- docker-pom: 'pom.xml'
- mvn-params: '-P docker'
+ - "{project-name}-{stream}-verify-java"
+ - "{project-name}-{stream}-merge-java":
+ docker-pom: "pom.xml"
+ mvn-params: "-P docker"
build-node: ubuntu1804-docker-8c-8g
- gerrit-maven-stage:
+ sbom-generator: true
sign-artifacts: true
- build-node: centos7-builder-4c-4g
+ build-node: centos8-docker-4c-4g
maven-versions-plugin: true
- mvn-params: '-Dmaven.test.skip=true'
+ mvn-params: "-Dmaven.test.skip=true"
- gerrit-maven-docker-stage:
+ sbom-generator: true
build-node: ubuntu1804-docker-8c-8g
maven-versions-plugin: true
- mvn-params: '-P docker -Dmaven.test.skip=true'
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
+ mvn-params: "-P docker -Dmaven.test.skip=true"
+ container-public-registry: "nexus3.onap.org:10001"
+ container-staging-registry: "nexus3.onap.org:10003"
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
- project: 'policy/models'
+ project: "policy/models"
stream:
- - 'master':
- branch: 'master'
- - 'honolulu':
- branch: 'honolulu'
- - 'istanbul':
- branch: 'istanbul'
- - 'jakarta':
- branch: 'jakarta'
- - 'kohn':
- branch: 'kohn'
- mvn-settings: 'policy-models-settings'
+ - "master":
+ branch: "master"
+ - "honolulu":
+ branch: "honolulu"
+ - "istanbul":
+ branch: "istanbul"
+ - "jakarta":
+ branch: "jakarta"
+ - "kohn":
+ branch: "kohn"
+ - "london":
+ branch: "london"
+ mvn-settings: "policy-models-settings"
java-version: openjdk11
- files: '**'
- archive-artifacts: ''
+ files: "**"
+ archive-artifacts: ""
build-node: ubuntu1804-builder-4c-4g
- project:
@@ -45,31 +49,30 @@
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
build-node: ubuntu1804-builder-4c-4g
- project: 'policy/models'
- project-name: 'policy-models'
- branch: 'master'
- mvn-settings: 'policy-models-settings'
+ project: "policy/models"
+ project-name: "policy-models"
+ branch: "master"
+ mvn-settings: "policy-models-settings"
java-version: openjdk11
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
- project:
name: policy-models-clm
jobs:
- gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
+ nexus-iq-namespace: "onap-"
project: policy/models
- project-name: 'policy-models'
+ project-name: "policy-models"
stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'policy-models-settings'
+ - "master":
+ branch: "master"
+ mvn-settings: "policy-models-settings"
java-version: openjdk11
- project:
@@ -77,6 +80,6 @@
project-name: policy-models
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: policy/models
branch: master
diff --git a/jjb/policy/policy-pap.yaml b/jjb/policy/policy-pap.yaml
index 7bf2bb2..c6a6521 100644
--- a/jjb/policy/policy-pap.yaml
+++ b/jjb/policy/policy-pap.yaml
@@ -1,43 +1,47 @@
---
- project:
name: policy-pap
- project-name: 'policy-pap'
+ project-name: "policy-pap"
jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java':
- docker-pom: 'pom.xml'
- mvn-params: '-P docker'
+ - "{project-name}-{stream}-verify-java"
+ - "{project-name}-{stream}-merge-java":
+ docker-pom: "pom.xml"
+ mvn-params: "-P docker"
build-node: ubuntu1804-docker-8c-8g
- gerrit-maven-stage:
+ sbom-generator: true
sign-artifacts: true
- build-node: centos7-builder-4c-4g
+ build-node: centos8-docker-4c-4g
maven-versions-plugin: true
- mvn-params: '-Dmaven.test.skip=true'
+ mvn-params: "-Dmaven.test.skip=true"
- gerrit-maven-docker-stage:
+ sbom-generator: true
build-node: ubuntu1804-docker-8c-8g
maven-versions-plugin: true
- mvn-params: '-P docker -Dmaven.test.skip=true'
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
+ mvn-params: "-P docker -Dmaven.test.skip=true"
+ container-public-registry: "nexus3.onap.org:10001"
+ container-staging-registry: "nexus3.onap.org:10003"
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
- project: 'policy/pap'
+ project: "policy/pap"
stream:
- - 'master':
- branch: 'master'
- - 'honolulu':
- branch: 'honolulu'
- - 'istanbul':
- branch: 'istanbul'
- - 'jakarta':
- branch: 'jakarta'
- - 'kohn':
- branch: 'kohn'
- mvn-settings: 'policy-pap-settings'
+ - "master":
+ branch: "master"
+ - "honolulu":
+ branch: "honolulu"
+ - "istanbul":
+ branch: "istanbul"
+ - "jakarta":
+ branch: "jakarta"
+ - "kohn":
+ branch: "kohn"
+ - "london":
+ branch: "london"
+ mvn-settings: "policy-pap-settings"
java-version: openjdk11
- files: '**'
- archive-artifacts: ''
+ files: "**"
+ archive-artifacts: ""
build-node: ubuntu1804-builder-4c-4g
- project:
@@ -45,31 +49,30 @@
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
build-node: ubuntu1804-builder-4c-4g
- project: 'policy/pap'
- project-name: 'policy-pap'
- branch: 'master'
- mvn-settings: 'policy-pap-settings'
+ project: "policy/pap"
+ project-name: "policy-pap"
+ branch: "master"
+ mvn-settings: "policy-pap-settings"
java-version: openjdk11
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
- project:
name: policy-pap-clm
jobs:
- gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
+ nexus-iq-namespace: "onap-"
project: policy/pap
- project-name: 'policy-pap'
+ project-name: "policy-pap"
stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'policy-pap-settings'
+ - "master":
+ branch: "master"
+ mvn-settings: "policy-pap-settings"
java-version: openjdk11
- project:
@@ -77,6 +80,6 @@
project-name: policy-pap
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: policy/pap
branch: master
diff --git a/jjb/policy/policy-parent.yaml b/jjb/policy/policy-parent.yaml
index 12929be..0c1a04c 100644
--- a/jjb/policy/policy-parent.yaml
+++ b/jjb/policy/policy-parent.yaml
@@ -1,47 +1,50 @@
---
- project:
name: policy-parent
- project-name: 'policy-parent'
+ project-name: "policy-parent"
jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
+ - "{project-name}-{stream}-verify-java"
+ - "{project-name}-{stream}-merge-java"
- gerrit-maven-stage:
+ sbom-generator: true
sign-artifacts: true
- build-node: centos7-builder-4c-4g
+ build-node: centos8-docker-4c-4g
maven-versions-plugin: true
- mvn-params: '-Dmaven.test.skip=true'
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
+ mvn-params: "-Dmaven.test.skip=true"
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
- project: 'policy/parent'
+ project: "policy/parent"
stream:
- - 'master':
- branch: 'master'
- - 'honolulu':
- branch: 'honolulu'
- - 'istanbul':
- branch: 'istanbul'
- - 'jakarta':
- branch: 'jakarta'
- - 'kohn':
- branch: 'kohn'
- mvn-settings: 'policy-parent-settings'
+ - "master":
+ branch: "master"
+ - "honolulu":
+ branch: "honolulu"
+ - "istanbul":
+ branch: "istanbul"
+ - "jakarta":
+ branch: "jakarta"
+ - "kohn":
+ branch: "kohn"
+ - "london":
+ branch: "london"
+ mvn-settings: "policy-parent-settings"
java-version: openjdk11
- files: '**'
- archive-artifacts: ''
+ files: "**"
+ archive-artifacts: ""
build-node: ubuntu1804-builder-4c-4g
- project:
name: policy-parent-clm
jobs:
- gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
+ nexus-iq-namespace: "onap-"
project: policy/parent
- project-name: 'policy-parent'
+ project-name: "policy-parent"
stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'policy-parent-settings'
+ - "master":
+ branch: "master"
+ mvn-settings: "policy-parent-settings"
java-version: openjdk11
- project:
@@ -49,6 +52,6 @@
project-name: policy-parent
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: policy/parent
branch: master
diff --git a/jjb/policy/policy-xacml-pdp.yaml b/jjb/policy/policy-xacml-pdp.yaml
index c1d0ffc..244e97f 100644
--- a/jjb/policy/policy-xacml-pdp.yaml
+++ b/jjb/policy/policy-xacml-pdp.yaml
@@ -1,43 +1,47 @@
---
- project:
name: policy-xacml-pdp
- project-name: 'policy-xacml-pdp'
+ project-name: "policy-xacml-pdp"
jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java':
- docker-pom: 'pom.xml'
- mvn-params: '-P docker'
+ - "{project-name}-{stream}-verify-java"
+ - "{project-name}-{stream}-merge-java":
+ docker-pom: "pom.xml"
+ mvn-params: "-P docker"
build-node: ubuntu1804-docker-8c-8g
- gerrit-maven-stage:
+ sbom-generator: true
sign-artifacts: true
- build-node: centos7-builder-4c-4g
+ build-node: centos8-docker-4c-4g
maven-versions-plugin: true
- mvn-params: '-Dmaven.test.skip=true'
+ mvn-params: "-Dmaven.test.skip=true"
- gerrit-maven-docker-stage:
+ sbom-generator: true
build-node: ubuntu1804-docker-8c-8g
maven-versions-plugin: true
- mvn-params: '-P docker -Dmaven.test.skip=true'
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
+ mvn-params: "-P docker -Dmaven.test.skip=true"
+ container-public-registry: "nexus3.onap.org:10001"
+ container-staging-registry: "nexus3.onap.org:10003"
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
- project: 'policy/xacml-pdp'
+ project: "policy/xacml-pdp"
stream:
- - 'master':
- branch: 'master'
- - 'honolulu':
- branch: 'honolulu'
- - 'istanbul':
- branch: 'istanbul'
- - 'jakarta':
- branch: 'jakarta'
- - 'kohn':
- branch: 'kohn'
- mvn-settings: 'policy-xacml-pdp-settings'
+ - "master":
+ branch: "master"
+ - "honolulu":
+ branch: "honolulu"
+ - "istanbul":
+ branch: "istanbul"
+ - "jakarta":
+ branch: "jakarta"
+ - "kohn":
+ branch: "kohn"
+ - "london":
+ branch: "london"
+ mvn-settings: "policy-xacml-pdp-settings"
java-version: openjdk11
- files: '**'
- archive-artifacts: ''
+ files: "**"
+ archive-artifacts: ""
build-node: ubuntu1804-builder-4c-4g
- project:
@@ -45,31 +49,30 @@
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
build-node: ubuntu1804-builder-4c-4g
- project: 'policy/xacml-pdp'
- project-name: 'policy-xacml-pdp'
- branch: 'master'
- mvn-settings: 'policy-xacml-pdp-settings'
+ project: "policy/xacml-pdp"
+ project-name: "policy-xacml-pdp"
+ branch: "master"
+ mvn-settings: "policy-xacml-pdp-settings"
java-version: openjdk11
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
- project:
name: policy-xacml-pdp-clm
jobs:
- gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
+ nexus-iq-namespace: "onap-"
project: policy/xacml-pdp
- project-name: 'policy-xacml-pdp'
+ project-name: "policy-xacml-pdp"
stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'policy-xacml-pdp-settings'
+ - "master":
+ branch: "master"
+ mvn-settings: "policy-xacml-pdp-settings"
java-version: openjdk11
- project:
@@ -77,6 +80,6 @@
project-name: policy-xacml-pdp
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: policy/xacml-pdp
branch: master
diff --git a/jjb/portal-ng/portal-ng-bff.yaml b/jjb/portal-ng/portal-ng-bff.yaml
new file mode 100644
index 0000000..508b800
--- /dev/null
+++ b/jjb/portal-ng/portal-ng-bff.yaml
@@ -0,0 +1,15 @@
+---
+- project:
+ name: portal-ng-bff-project-view
+ project-name: portal-ng-bff
+ views:
+ - project-view
+
+- project:
+ name: portal-ng-bff-info
+ project: portal-ng/bff
+ project-name: portal-ng-bff
+ build-node: centos8-builder-2c-1g
+ branch: master
+ jobs:
+ - gerrit-info-yaml-verify
diff --git a/jjb/portal-ng/portal-ng-history.yaml b/jjb/portal-ng/portal-ng-history.yaml
new file mode 100644
index 0000000..1084da7
--- /dev/null
+++ b/jjb/portal-ng/portal-ng-history.yaml
@@ -0,0 +1,15 @@
+---
+- project:
+ name: portal-ng-history-project-view
+ project-name: portal-ng-history
+ views:
+ - project-view
+
+- project:
+ name: portal-ng-history-info
+ project: portal-ng/history
+ project-name: portal-ng-history
+ build-node: centos8-builder-2c-1g
+ branch: master
+ jobs:
+ - gerrit-info-yaml-verify
diff --git a/jjb/portal-ng/portal-ng-preferences.yaml b/jjb/portal-ng/portal-ng-preferences.yaml
new file mode 100644
index 0000000..6847f1d
--- /dev/null
+++ b/jjb/portal-ng/portal-ng-preferences.yaml
@@ -0,0 +1,15 @@
+---
+- project:
+ name: portal-ng-preferences-project-view
+ project-name: portal-ng-preferences
+ views:
+ - project-view
+
+- project:
+ name: portal-ng-preferences-info
+ project: portal-ng/preferences
+ project-name: portal-ng-preferences
+ build-node: centos8-builder-2c-1g
+ branch: master
+ jobs:
+ - gerrit-info-yaml-verify
diff --git a/jjb/portal-ng/portal-ng-ui.yaml b/jjb/portal-ng/portal-ng-ui.yaml
new file mode 100644
index 0000000..ee25057
--- /dev/null
+++ b/jjb/portal-ng/portal-ng-ui.yaml
@@ -0,0 +1,15 @@
+---
+- project:
+ name: portal-ng-ui-project-view
+ project-name: portal-ng-ui
+ views:
+ - project-view
+
+- project:
+ name: portal-ng-ui-info
+ project: portal-ng/ui
+ project-name: portal-ng-ui
+ build-node: centos8-builder-2c-1g
+ branch: master
+ jobs:
+ - gerrit-info-yaml-verify
diff --git a/jjb/portal-ng/portal-ng.yaml b/jjb/portal-ng/portal-ng.yaml
new file mode 100644
index 0000000..6f2bc4a
--- /dev/null
+++ b/jjb/portal-ng/portal-ng.yaml
@@ -0,0 +1,15 @@
+---
+- project:
+ name: portal-ng-project-view
+ project-name: portal-ng
+ views:
+ - project-view
+
+- project:
+ name: portal-ng-info
+ project: portal-ng
+ project-name: portal-ng
+ build-node: centos8-builder-2c-1g
+ branch: master
+ jobs:
+ - gerrit-info-yaml-verify
diff --git a/jjb/relman/relman.yaml b/jjb/relman/relman.yaml
index 94ba547..9bd1971 100644
--- a/jjb/relman/relman.yaml
+++ b/jjb/relman/relman.yaml
@@ -9,6 +9,6 @@
name: relman-info
project: relman
project-name: relman
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
jobs:
- gerrit-info-yaml-verify
diff --git a/jjb/rtdv3/rtdv3.yaml b/jjb/rtdv3/rtdv3.yaml
index eb0d11a..2ed8d61 100644
--- a/jjb/rtdv3/rtdv3.yaml
+++ b/jjb/rtdv3/rtdv3.yaml
@@ -16,7 +16,7 @@
default-version: latest
tox-dir: "docs/"
doc-dir: "_build/html"
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
# the jjb is very short and filtering docs falsy raises side effects in
# ONAP doc
gerrit_trigger_file_paths:
@@ -40,4 +40,4 @@
build-timeout: 30
stream:
- master:
- branch: '*'
+ branch: "*"
diff --git a/jjb/sdc/sdc-csit.yaml b/jjb/sdc/sdc-csit.yaml
index da54f39..2fd7e9b 100644
--- a/jjb/sdc/sdc-csit.yaml
+++ b/jjb/sdc/sdc-csit.yaml
@@ -1,31 +1,32 @@
---
- project:
- name: sdc-csit
- jobs:
- - '{project-name}-{stream}-verify-java':
- # this build is integration test only - CSIT (Verify 2/2)
- mvn-goals: clean install
- mvn-params: '-Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/ -Ddocker.skip.push=true -P docker,all-for-integration-tests-only,integration-tests-with-helm-validator'
- build-node: 'ubuntu1804-docker-8c-16g'
- archive-artifacts: >
- **/*.log
- **/hs_err_*.log
- **/target/**/feature.xml
- **/target/failsafe-reports/failsafe-summary.xml
- integration-tests/target/ExtentReport/API/*.html
- integration-tests/target/ExtentReport/UI/*.html
- integration-tests/target/ExtentReport/UI/screenshots/*.png
- project-name: 'sdc-integration-tests'
- # project name in gerrit
- project: 'sdc'
- stream:
- - 'master':
- branch: 'master'
- - 'jakarta':
- branch: 'jakarta'
- - 'kohn':
- branch: 'kohn'
- java-version: openjdk11
- maven-version: 'mvn36'
- mvn-settings: 'sdc-settings'
- mvn-global-settings: global-settings
+ name: sdc-csit
+ jobs:
+ - "{project-name}-{stream}-verify-java":
+ # this build is integration test only - CSIT (Verify 2/2)
+ mvn-goals: clean install
+ # yamllint disable-line rule:line-length
+ mvn-params: "-Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/ -Ddocker.skip.push=true -P docker,all-for-integration-tests-only,integration-tests-with-helm-validator"
+ build-node: "ubuntu1804-docker-8c-16g"
+ archive-artifacts: >
+ **/*.log
+ **/hs_err_*.log
+ **/target/**/feature.xml
+ **/target/failsafe-reports/failsafe-summary.xml
+ integration-tests/target/ExtentReport/API/*.html
+ integration-tests/target/ExtentReport/UI/*.html
+ integration-tests/target/ExtentReport/UI/screenshots/*.png
+ project-name: "sdc-integration-tests"
+ # project name in gerrit
+ project: "sdc"
+ stream:
+ - "master":
+ branch: "master"
+ - "jakarta":
+ branch: "jakarta"
+ - "kohn":
+ branch: "kohn"
+ java-version: openjdk11
+ maven-version: "mvn36"
+ mvn-settings: "sdc-settings"
+ mvn-global-settings: global-settings
diff --git a/jjb/sdc/sdc-onap-ui-angular.yaml b/jjb/sdc/sdc-onap-ui-angular.yaml
index 0108cd7..c270ee3 100644
--- a/jjb/sdc/sdc-onap-ui-angular.yaml
+++ b/jjb/sdc/sdc-onap-ui-angular.yaml
@@ -7,48 +7,47 @@
- project:
name: sdc-onap-ui-angular-info
- project-name: 'sdc-onap-ui-angular'
+ project-name: "sdc-onap-ui-angular"
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
- project: 'sdc/onap-ui-angular'
- branch: 'master'
+ build-node: centos8-builder-2c-1g
+ project: "sdc/onap-ui-angular"
+ branch: "master"
- project:
name: sdc-onap-ui-angular
- project-name: 'sdc-onap-ui-angular'
+ project-name: "sdc-onap-ui-angular"
jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
- project: 'sdc/onap-ui-angular'
+ - "{project-name}-{stream}-verify-java"
+ - "{project-name}-{stream}-merge-java"
+ project: "sdc/onap-ui-angular"
stream:
- - 'master':
- branch: 'master'
- - 'jakarta':
- branch: 'jakarta'
- - 'kohn':
- branch: 'kohn'
- mvn-settings: 'sdc-onap-ui-angular-settings'
- files: '**'
- archive-artifacts: ''
+ - "master":
+ branch: "master"
+ - "jakarta":
+ branch: "jakarta"
+ - "kohn":
+ branch: "kohn"
+ mvn-settings: "sdc-onap-ui-angular-settings"
+ files: "**"
+ archive-artifacts: ""
build-timeout: 60
- maven-version: 'mvn36'
+ maven-version: "mvn36"
- project:
name: sdc-onap-ui-angular-sonar
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
build-node: ubuntu1804-builder-4c-4g
- project: 'sdc/onap-ui-angular'
- project-name: 'sdc-onap-ui-angular'
- branch: 'master'
- mvn-settings: 'sdc-onap-ui-angular-settings'
- mvn-params: '-Dsonar.branch={branch}'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m'
+ project: "sdc/onap-ui-angular"
+ project-name: "sdc-onap-ui-angular"
+ branch: "master"
+ mvn-settings: "sdc-onap-ui-angular-settings"
+ mvn-params: "-Dsonar.branch={branch}"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m"
diff --git a/jjb/sdc/sdc-onap-ui-common.yaml b/jjb/sdc/sdc-onap-ui-common.yaml
index 58175fb..286557e 100644
--- a/jjb/sdc/sdc-onap-ui-common.yaml
+++ b/jjb/sdc/sdc-onap-ui-common.yaml
@@ -1,48 +1,47 @@
---
- project:
name: sdc-onap-ui-common-info
- project-name: 'sdc-onap-ui-common'
+ project-name: "sdc-onap-ui-common"
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
- project: 'sdc/onap-ui-common'
- branch: 'master'
+ build-node: centos8-builder-2c-1g
+ project: "sdc/onap-ui-common"
+ branch: "master"
- project:
name: sdc-onap-ui-common
- project-name: 'sdc-onap-ui-common'
+ project-name: "sdc-onap-ui-common"
jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
- project: 'sdc/onap-ui-common'
+ - "{project-name}-{stream}-verify-java"
+ - "{project-name}-{stream}-merge-java"
+ project: "sdc/onap-ui-common"
stream:
- - 'master':
- branch: 'master'
- - 'jakarta':
- branch: 'jakarta'
- - 'kohn':
- branch: 'kohn'
- mvn-settings: 'sdc-onap-ui-common-settings'
- files: '**'
- archive-artifacts: ''
+ - "master":
+ branch: "master"
+ - "jakarta":
+ branch: "jakarta"
+ - "kohn":
+ branch: "kohn"
+ mvn-settings: "sdc-onap-ui-common-settings"
+ files: "**"
+ archive-artifacts: ""
build-timeout: 60
- maven-version: 'mvn36'
+ maven-version: "mvn36"
- project:
name: sdc-onap-ui-common-sonar
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
build-node: ubuntu1804-builder-4c-4g
- project: 'sdc/onap-ui-common'
- project-name: 'sdc-onap-ui-common'
- branch: 'master'
- mvn-settings: 'sdc-onap-ui-common-settings'
- mvn-params: '-Dsonar.branch={branch}'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m'
+ project: "sdc/onap-ui-common"
+ project-name: "sdc-onap-ui-common"
+ branch: "master"
+ mvn-settings: "sdc-onap-ui-common-settings"
+ mvn-params: "-Dsonar.branch={branch}"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m"
diff --git a/jjb/sdc/sdc-sdc-be-common.yaml b/jjb/sdc/sdc-sdc-be-common.yaml
index 3747be7..a2d474d 100644
--- a/jjb/sdc/sdc-sdc-be-common.yaml
+++ b/jjb/sdc/sdc-sdc-be-common.yaml
@@ -7,66 +7,66 @@
- project:
name: sdc-sdc-be-common
- project-name: 'sdc-sdc-be-common'
+ project-name: "sdc-sdc-be-common"
jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
+ - "{project-name}-{stream}-verify-java"
+ - "{project-name}-{stream}-merge-java"
- gerrit-maven-stage:
sign-artifacts: true
- build-node: centos7-builder-4c-4g
+ sbom-generator: true
+ build-node: centos8-docker-4c-4g
maven-versions-plugin: true
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
- project: 'sdc/sdc-be-common'
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
+ project: "sdc/sdc-be-common"
stream:
- - 'master':
- branch: 'master'
- - 'jakarta':
- branch: 'jakarta'
- - 'kohn':
- branch: 'kohn'
- mvn-settings: 'sdc-sdc-be-common-settings'
- files: '**'
- archive-artifacts: ''
+ - "master":
+ branch: "master"
+ - "jakarta":
+ branch: "jakarta"
+ - "kohn":
+ branch: "kohn"
+ mvn-settings: "sdc-sdc-be-common-settings"
+ files: "**"
+ archive-artifacts: ""
build-timeout: 60
- maven-version: 'mvn36'
+ maven-version: "mvn36"
- project:
name: sdc-sdc-be-common-sonar
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
build-node: ubuntu1804-builder-4c-4g
- project: 'sdc/sdc-be-common'
- project-name: 'sdc-sdc-be-common'
- branch: 'master'
- mvn-settings: 'sdc-sdc-be-common-settings'
- mvn-params: '-Dsonar.branch={branch}'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m'
+ project: "sdc/sdc-be-common"
+ project-name: "sdc-sdc-be-common"
+ branch: "master"
+ mvn-settings: "sdc-sdc-be-common-settings"
+ mvn-params: "-Dsonar.branch={branch}"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m"
- project:
name: sdc-sdc-be-common-clm
jobs:
- gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
+ nexus-iq-namespace: "onap-"
project: sdc/sdc-be-common
- project-name: 'sdc-sdc-be-common'
+ project-name: "sdc-sdc-be-common"
stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'sdc-sdc-be-common-settings'
+ - "master":
+ branch: "master"
+ mvn-settings: "sdc-sdc-be-common-settings"
- project:
name: sdc-sdc-be-common-info
project-name: sdc-sdc-be-common
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: sdc/sdc-be-common
branch: master
diff --git a/jjb/sdc/sdc-sdc-distribution-client.yaml b/jjb/sdc/sdc-sdc-distribution-client.yaml
index 05fb9fd..153511f 100644
--- a/jjb/sdc/sdc-sdc-distribution-client.yaml
+++ b/jjb/sdc/sdc-sdc-distribution-client.yaml
@@ -7,85 +7,85 @@
- project:
name: sdc-sdc-distribution-client
- project-name: 'sdc-sdc-distribution-client'
+ project-name: "sdc-sdc-distribution-client"
jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
+ - "{project-name}-{stream}-verify-java"
+ - "{project-name}-{stream}-merge-java"
- gerrit-maven-stage:
sign-artifacts: true
- build-node: centos7-builder-4c-4g
+ sbom-generator: true
+ build-node: centos8-docker-4c-4g
maven-versions-plugin: true
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
- project: 'sdc/sdc-distribution-client'
+ project: "sdc/sdc-distribution-client"
stream:
- - 'master':
- branch: 'master'
+ - "master":
+ branch: "master"
java-version: openjdk11
- - 'jakarta':
- branch: 'jakarta'
+ - "jakarta":
+ branch: "jakarta"
java-version: openjdk11
- - 'kohn':
- branch: 'kohn'
+ - "kohn":
+ branch: "kohn"
java-version: openjdk11
- mvn-settings: 'sdc-sdc-distribution-client-settings'
- files: '**'
- archive-artifacts: ''
+ mvn-settings: "sdc-sdc-distribution-client-settings"
+ files: "**"
+ archive-artifacts: ""
build-timeout: 60
- maven-version: 'mvn36'
+ maven-version: "mvn36"
- project:
name: sdc-sdc-distribution-client-integration-pairwise
java-version: openjdk11
jobs:
- - '{project-name}-{stream}-integration-pairwise'
+ - "{project-name}-{stream}-integration-pairwise"
build-node: ubuntu1804-docker-8c-8g
- project: 'sdc/sdc-distribution-client'
- project-name: 'sdc-sdc-distribution-client'
+ project: "sdc/sdc-distribution-client"
+ project-name: "sdc-sdc-distribution-client"
stream:
- - 'master':
- branch: 'master'
- java-version: openjdk11
+ - "master":
+ branch: "master"
+ java-version: openjdk11
- mvn-settings: 'sdc-sdc-distribution-client-settings'
- files: '**'
- archive-artifacts: ''
+ mvn-settings: "sdc-sdc-distribution-client-settings"
+ files: "**"
+ archive-artifacts: ""
build-timeout: 60
- maven-version: 'mvn36'
- mvn-params: ' -P integration-pairwise'
+ maven-version: "mvn36"
+ mvn-params: " -P integration-pairwise"
- project:
name: sdc-sdc-distribution-client-sonar
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
build-node: ubuntu1804-builder-4c-4g
- project: 'sdc/sdc-distribution-client'
- project-name: 'sdc-sdc-distribution-client'
- branch: 'master'
- mvn-settings: 'sdc-sdc-distribution-client-settings'
+ project: "sdc/sdc-distribution-client"
+ project-name: "sdc-sdc-distribution-client"
+ branch: "master"
+ mvn-settings: "sdc-sdc-distribution-client-settings"
java-version: openjdk11
- mvn-params: '-Dsonar.branch={branch}'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m'
+ mvn-params: "-Dsonar.branch={branch}"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m"
- project:
name: sdc-sdc-distribution-client-clm
jobs:
- gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
+ nexus-iq-namespace: "onap-"
project: sdc/sdc-distribution-client
- project-name: 'sdc-sdc-distribution-client'
+ project-name: "sdc-sdc-distribution-client"
stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'sdc-sdc-distribution-client-settings'
+ - "master":
+ branch: "master"
+ mvn-settings: "sdc-sdc-distribution-client-settings"
java-version: openjdk11
- project:
@@ -93,6 +93,6 @@
project-name: sdc-sdc-distribution-client
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: sdc/sdc-distribution-client
branch: master
diff --git a/jjb/sdc/sdc-sdc-docker-base.yaml b/jjb/sdc/sdc-sdc-docker-base.yaml
deleted file mode 100644
index 0a894db..0000000
--- a/jjb/sdc/sdc-sdc-docker-base.yaml
+++ /dev/null
@@ -1,43 +0,0 @@
----
-
-- project:
- name: sdc-sdc-docker-base
- project-name: 'sdc-sdc-docker-base'
- jobs:
- - '{project-name}-{stream}-verify-java':
- build-node: 'ubuntu1804-docker-v1-8c-8g'
- docker-pom: 'pom.xml'
- - '{project-name}-{stream}-sdc-merge-java':
- build-node: 'ubuntu1804-docker-8c-8g'
- docker-pom: 'pom.xml'
- mvn-profile: 'default'
- - gerrit-maven-docker-stage:
- build-node: ubuntu1804-docker-8c-8g
- maven-versions-plugin: true
- mvn-params: '-P default'
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
- project: 'sdc/sdc-docker-base'
- stream:
- - 'master':
- branch: 'master'
- - 'jakarta':
- branch: 'jakarta'
- - 'kohn':
- branch: 'kohn'
- mvn-settings: 'sdc-sdc-docker-base-settings'
- files: '**'
- archive-artifacts: ''
- build-node: ubuntu1804-builder-4c-4g
- maven-version: 'mvn36'
-
-- project:
- name: sdc-sdc-docker-base-info
- project-name: sdc-sdc-docker-base
- jobs:
- - gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
- project: sdc/sdc-docker-base
- branch: master
diff --git a/jjb/sdc/sdc-sdc-helm-validator-csit.yaml b/jjb/sdc/sdc-sdc-helm-validator-csit.yaml
index 64b6821..ea3cef1 100644
--- a/jjb/sdc/sdc-sdc-helm-validator-csit.yaml
+++ b/jjb/sdc/sdc-sdc-helm-validator-csit.yaml
@@ -1,16 +1,16 @@
---
- project:
- name: sdc-sdc-helm-validator-csit
- jobs:
- - "{project-name}-{stream}-verify-csit-{functionality}"
- - "{project-name}-{stream}-csit-{functionality}"
- project-name: "sdc"
- stream:
- - "master":
- branch: "master"
- - "kohn":
- branch: "kohn"
- functionality:
- - "sdc-helm-validator":
- trigger_jobs:
- robot-options: ""
+ name: sdc-sdc-helm-validator-csit
+ jobs:
+ - "{project-name}-{stream}-verify-csit-{functionality}"
+ - "{project-name}-{stream}-csit-{functionality}"
+ project-name: "sdc"
+ stream:
+ - "master":
+ branch: "master"
+ - "kohn":
+ branch: "kohn"
+ functionality:
+ - "sdc-helm-validator":
+ trigger_jobs:
+ robot-options: ""
diff --git a/jjb/sdc/sdc-sdc-helm-validator.yaml b/jjb/sdc/sdc-sdc-helm-validator.yaml
index 0f527b4..d55c0e2 100644
--- a/jjb/sdc/sdc-sdc-helm-validator.yaml
+++ b/jjb/sdc/sdc-sdc-helm-validator.yaml
@@ -9,69 +9,69 @@
name: sdc-sdc-helm-validator-info
project: sdc/sdc-helm-validator
project-name: sdc-sdc-helm-validator
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
jobs:
- gerrit-info-yaml-verify
- project:
name: sdc-sdc-helm-validator
- project-name: 'sdc-sdc-helm-validator'
+ project-name: "sdc-sdc-helm-validator"
java-version: openjdk11
jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
+ - "{project-name}-{stream}-verify-java"
+ - "{project-name}-{stream}-merge-java"
- gerrit-maven-stage:
sign-artifacts: true
- build-node: centos7-docker-8c-8g
+ sbom-generator: true
+ build-node: centos8-docker-8c-8g
maven-versions-plugin: true
- mvn-goals: 'clean deploy'
+ mvn-goals: "clean deploy"
- gerrit-maven-docker-stage:
+ sbom-generator: true
build-node: ubuntu1804-docker-8c-8g
maven-versions-plugin: true
- mvn-goals: 'clean install docker:build docker:push'
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
- project: 'sdc/sdc-helm-validator'
- mvn-settings: 'sdc-sdc-helm-validator-settings'
+ mvn-goals: "clean install docker:build docker:push"
+ container-public-registry: "nexus3.onap.org:10001"
+ container-staging-registry: "nexus3.onap.org:10003"
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
+ project: "sdc/sdc-helm-validator"
+ mvn-settings: "sdc-sdc-helm-validator-settings"
stream:
- - 'master':
- branch: 'master'
- files: '**'
- archive-artifacts: ''
+ - "master":
+ branch: "master"
+ files: "**"
+ archive-artifacts: ""
build-node: ubuntu1804-docker-8c-8g
-
- project:
name: sdc-sdc-helm-validator-sonar
java-version: openjdk11
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
build-node: ubuntu1804-docker-8c-8g
- project: 'sdc/sdc-helm-validator'
- project-name: 'sdc-sdc-helm-validator'
- branch: 'master'
- mvn-settings: 'sdc-sdc-helm-validator-settings'
- mvn-params: '-Dsonar.branch={branch}'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m'
+ project: "sdc/sdc-helm-validator"
+ project-name: "sdc-sdc-helm-validator"
+ branch: "master"
+ mvn-settings: "sdc-sdc-helm-validator-settings"
+ mvn-params: "-Dsonar.branch={branch}"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m"
- project:
name: sdc-sdc-helm-validator-clm
java-version: openjdk11
jobs:
- gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
- project: 'sdc/sdc-helm-validator'
- project-name: 'sdc-sdc-helm-validator'
+ nexus-iq-namespace: "onap-"
+ project: "sdc/sdc-helm-validator"
+ project-name: "sdc-sdc-helm-validator"
stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'sdc-sdc-helm-validator-settings'
+ - "master":
+ branch: "master"
+ mvn-settings: "sdc-sdc-helm-validator-settings"
diff --git a/jjb/sdc/sdc-sdc-pubsub.yaml b/jjb/sdc/sdc-sdc-pubsub.yaml
index fb3539d..cc838be 100644
--- a/jjb/sdc/sdc-sdc-pubsub.yaml
+++ b/jjb/sdc/sdc-sdc-pubsub.yaml
@@ -1,48 +1,47 @@
---
- project:
name: sdc-sdc-pubsub-info
- project-name: 'sdc-sdc-pubsub'
+ project-name: "sdc-sdc-pubsub"
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
- project: 'sdc/sdc-pubsub'
- branch: 'master'
+ build-node: centos8-builder-2c-1g
+ project: "sdc/sdc-pubsub"
+ branch: "master"
- project:
name: sdc-sdc-pubsub
- project-name: 'sdc-sdc-pubsub'
+ project-name: "sdc-sdc-pubsub"
jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
- project: 'sdc/sdc-pubsub'
+ - "{project-name}-{stream}-verify-java"
+ - "{project-name}-{stream}-merge-java"
+ project: "sdc/sdc-pubsub"
stream:
- - 'master':
- branch: 'master'
- - 'jakarta':
- branch: 'jakarta'
- - 'kohn':
- branch: 'kohn'
- mvn-settings: 'sdc-sdc-pubsub-settings'
- files: '**'
- archive-artifacts: ''
+ - "master":
+ branch: "master"
+ - "jakarta":
+ branch: "jakarta"
+ - "kohn":
+ branch: "kohn"
+ mvn-settings: "sdc-sdc-pubsub-settings"
+ files: "**"
+ archive-artifacts: ""
build-timeout: 60
- maven-version: 'mvn36'
+ maven-version: "mvn36"
- project:
name: sdc-sdc-pubsub-sonar
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
build-node: ubuntu1804-builder-4c-4g
- project: 'sdc/sdc-pubsub'
- project-name: 'sdc-sdc-pubsub'
- branch: 'master'
- mvn-settings: 'sdc-sdc-pubsub-settings'
- mvn-params: '-Dsonar.branch={branch}'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m'
+ project: "sdc/sdc-pubsub"
+ project-name: "sdc-sdc-pubsub"
+ branch: "master"
+ mvn-settings: "sdc-sdc-pubsub-settings"
+ mvn-params: "-Dsonar.branch={branch}"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m"
diff --git a/jjb/sdc/sdc-sdc-tosca.yaml b/jjb/sdc/sdc-sdc-tosca.yaml
index 79d736f..ea7253c 100644
--- a/jjb/sdc/sdc-sdc-tosca.yaml
+++ b/jjb/sdc/sdc-sdc-tosca.yaml
@@ -8,30 +8,31 @@
- project:
name: sdc-sdc-tosca
- project-name: 'sdc-sdc-tosca'
+ project-name: "sdc-sdc-tosca"
jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
+ - "{project-name}-{stream}-verify-java"
+ - "{project-name}-{stream}-merge-java"
- gerrit-maven-stage:
sign-artifacts: true
- build-node: centos7-builder-4c-4g
+ sbom-generator: true
+ build-node: centos8-docker-4c-4g
maven-versions-plugin: true
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
- project: 'sdc/sdc-tosca'
+ project: "sdc/sdc-tosca"
stream:
- - 'master':
- branch: 'master'
- - 'jakarta':
- branch: 'jakarta'
- - 'kohn':
- branch: 'kohn'
- mvn-settings: 'sdc-sdc-tosca-settings'
- files: '**'
- archive-artifacts: ''
+ - "master":
+ branch: "master"
+ - "jakarta":
+ branch: "jakarta"
+ - "kohn":
+ branch: "kohn"
+ mvn-settings: "sdc-sdc-tosca-settings"
+ files: "**"
+ archive-artifacts: ""
build-timeout: 60
- maven-version: 'mvn36'
+ maven-version: "mvn36"
java-version: openjdk11
- project:
@@ -39,32 +40,31 @@
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
build-node: ubuntu1804-builder-4c-4g
- project: 'sdc/sdc-tosca'
- project-name: 'sdc-sdc-tosca'
- branch: 'master'
- mvn-settings: 'sdc-sdc-tosca-settings'
- mvn-params: '-Dsonar.branch={branch}'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m'
+ project: "sdc/sdc-tosca"
+ project-name: "sdc-sdc-tosca"
+ branch: "master"
+ mvn-settings: "sdc-sdc-tosca-settings"
+ mvn-params: "-Dsonar.branch={branch}"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m"
java-version: openjdk11
- project:
name: sdc-sdc-tosca-clm
jobs:
- gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
+ nexus-iq-namespace: "onap-"
project: sdc/sdc-tosca
- project-name: 'sdc-sdc-tosca'
+ project-name: "sdc-sdc-tosca"
stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'sdc-sdc-tosca-settings'
+ - "master":
+ branch: "master"
+ mvn-settings: "sdc-sdc-tosca-settings"
java-version: openjdk11
- project:
@@ -72,7 +72,7 @@
project-name: sdc-sdc-tosca
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: sdc/sdc-tosca
branch: master
java-version: openjdk11
diff --git a/jjb/sdc/sdc-sdc-workflow-designer.yaml b/jjb/sdc/sdc-sdc-workflow-designer.yaml
index 47f0ca9..12c0062 100644
--- a/jjb/sdc/sdc-sdc-workflow-designer.yaml
+++ b/jjb/sdc/sdc-sdc-workflow-designer.yaml
@@ -8,72 +8,73 @@
- project:
name: sdc-sdc-workflow-designer
- project-name: 'sdc-sdc-workflow-designer'
+ project-name: "sdc-sdc-workflow-designer"
jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
+ - "{project-name}-{stream}-verify-java"
+ - "{project-name}-{stream}-merge-java"
- gerrit-maven-stage:
sign-artifacts: true
- build-node: centos7-builder-4c-4g
+ sbom-generator: true
+ build-node: centos8-docker-4c-4g
maven-versions-plugin: true
- gerrit-maven-docker-stage:
+ sbom-generator: true
build-node: ubuntu1804-docker-8c-8g
maven-versions-plugin: true
- mvn-params: '-P docker -Dmaven.test.skip=true'
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
+ mvn-params: "-P docker -Dmaven.test.skip=true"
+ container-public-registry: "nexus3.onap.org:10001"
+ container-staging-registry: "nexus3.onap.org:10003"
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
java-version: openjdk11
- project: 'sdc/sdc-workflow-designer'
+ project: "sdc/sdc-workflow-designer"
stream:
- - 'master':
- branch: 'master'
- - 'jakarta':
- branch: 'jakarta'
- - 'kohn':
- branch: 'kohn'
- mvn-settings: 'sdc-sdc-workflow-designer-settings'
- files: '**'
- archive-artifacts: ''
- docker-pom: 'pom.xml'
+ - "master":
+ branch: "master"
+ - "jakarta":
+ branch: "jakarta"
+ - "kohn":
+ branch: "kohn"
+ mvn-settings: "sdc-sdc-workflow-designer-settings"
+ files: "**"
+ archive-artifacts: ""
+ docker-pom: "pom.xml"
mvn-profile: docker
build-node: ubuntu1804-builder-4c-4g
- maven-version: 'mvn36'
+ maven-version: "mvn36"
- project:
name: sdc-sdc-workflow-designer-sonar
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
build-node: ubuntu1804-builder-4c-4g
- project: 'sdc/sdc-workflow-designer'
- project-name: 'sdc-sdc-workflow-designer'
- branch: 'master'
- mvn-settings: 'sdc-sdc-workflow-designer-settings'
- mvn-params: '-Djacoco.skip=false -Dsonar.branch={branch}'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m'
+ project: "sdc/sdc-workflow-designer"
+ project-name: "sdc-sdc-workflow-designer"
+ branch: "master"
+ mvn-settings: "sdc-sdc-workflow-designer-settings"
+ mvn-params: "-Djacoco.skip=false -Dsonar.branch={branch}"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m"
java-version: openjdk11
- project:
name: sdc-sdc-workflow-designer-clm
jobs:
- gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
+ nexus-iq-namespace: "onap-"
project: sdc/sdc-workflow-designer
- project-name: 'sdc-sdc-workflow-designer'
+ project-name: "sdc-sdc-workflow-designer"
build-node: ubuntu1804-builder-4c-4g
stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'sdc-sdc-workflow-designer-settings'
+ - "master":
+ branch: "master"
+ mvn-settings: "sdc-sdc-workflow-designer-settings"
java-version: openjdk11
- project:
@@ -81,7 +82,7 @@
project-name: sdc-sdc-workflow-designer
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: sdc/sdc-workflow-designer
branch: master
java-version: openjdk11
diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml
index 61cb705..0588833 100644
--- a/jjb/sdc/sdc.yaml
+++ b/jjb/sdc/sdc.yaml
@@ -25,60 +25,63 @@
- project:
name: sdc
- project-name: 'sdc'
+ project-name: "sdc"
jobs:
- - '{project-name}-{stream}-verify-java':
+ - "{project-name}-{stream}-verify-java":
# this build is unit test only (Verify 1/2)
- mvn-params: '-P skip-integration-tests -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/'
- build-node: 'ubuntu1804-docker-8c-8g'
- - '{project-name}-{stream}-sdc-merge-java':
- build-node: 'ubuntu1804-docker-8c-16g'
- docker-pom: 'pom.xml'
- mvn-profile: 'docker'
- mvn-params: '-Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/ -P integration-tests-with-helm-validator'
+ mvn-params: "-P skip-integration-tests -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/"
+ build-node: "ubuntu1804-docker-8c-8g"
+ - "{project-name}-{stream}-sdc-merge-java":
+ build-node: "ubuntu1804-docker-8c-16g"
+ docker-pom: "pom.xml"
+ mvn-profile: "docker"
+ # yamllint disable-line rule:line-length
+ mvn-params: "-Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/ -P integration-tests-with-helm-validator"
# running everything (unit tests and integration tests in a single job for merge, as we don't need // run
# for merge, but still saving integration tests results and report.
archive-artifacts: >
- **/*.log
- **/hs_err_*.log
- **/target/**/feature.xml
- **/target/failsafe-reports/failsafe-summary.xml
- integration-tests/target/ExtentReport/API/*.html
- integration-tests/target/ExtentReport/UI/*.html
- integration-tests/target/ExtentReport/UI/screenshots/*.png
+ **/*.log
+ **/hs_err_*.log
+ **/target/**/feature.xml
+ **/target/failsafe-reports/failsafe-summary.xml
+ integration-tests/target/ExtentReport/API/*.html
+ integration-tests/target/ExtentReport/UI/*.html
+ integration-tests/target/ExtentReport/UI/screenshots/*.png
- gerrit-maven-stage:
build-timeout: 90
sign-artifacts: true
- build-node: centos7-builder-4c-4g
+ sbom-generator: true
+ build-node: centos8-docker-4c-4g
maven-versions-plugin: true
- mvn-version: 'mvn36'
- mvn-params: '-DskipTests=true -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/'
+ mvn-version: "mvn36"
+ mvn-params: "-DskipTests=true -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/"
- gerrit-maven-docker-stage:
+ sbom-generator: true
build-node: ubuntu1804-docker-v1-8c-8g
maven-versions-plugin: true
- mvn-params: '-P docker -DskipTests=true -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/'
- mvn-version: 'mvn36'
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
+ mvn-params: "-P docker -DskipTests=true -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/"
+ mvn-version: "mvn36"
+ container-public-registry: "nexus3.onap.org:10001"
+ container-staging-registry: "nexus3.onap.org:10003"
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
- project: 'sdc'
+ project: "sdc"
stream:
- - 'master':
- branch: 'master'
+ - "master":
+ branch: "master"
java-version: openjdk11
- - 'jakarta':
- branch: 'jakarta'
+ - "jakarta":
+ branch: "jakarta"
java-version: openjdk11
- - 'kohn':
- branch: 'kohn'
+ - "kohn":
+ branch: "kohn"
java-version: openjdk11
- mvn-settings: 'sdc-settings'
- files: '**'
- archive-artifacts: ''
+ mvn-settings: "sdc-settings"
+ files: "**"
+ archive-artifacts: ""
build-node: ubuntu1804-docker-8c-8g
- maven-version: 'mvn36'
+ maven-version: "mvn36"
- project:
name: sdc-sonar
@@ -86,21 +89,20 @@
- gerrit-maven-sonar:
build-timeout: 120
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
build-node: ubuntu1804-docker-8c-16g
- project: 'sdc'
- project-name: 'sdc'
- branch: 'master'
- mvn-settings: 'sdc-settings'
+ project: "sdc"
+ project-name: "sdc"
+ branch: "master"
+ mvn-settings: "sdc-settings"
java-version: openjdk11
- mvn-params: '-P skip-integration-tests -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m'
- mvn-version: 'mvn36'
+ mvn-params: "-P skip-integration-tests -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m"
+ mvn-version: "mvn36"
- project:
name: sdc-clm
@@ -108,16 +110,16 @@
- gerrit-maven-clm:
build-timeout: 120
submodule-timeout: 30
- mvn-params: '-P skip-integration-tests -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/'
- nexus-iq-namespace: 'onap-'
+ mvn-params: "-P skip-integration-tests -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/"
+ nexus-iq-namespace: "onap-"
project: sdc
- project-name: 'sdc'
+ project-name: "sdc"
build-node: ubuntu1804-docker-8c-8g
stream:
- - 'master':
- branch: 'master'
- mvn-version: 'mvn36'
- mvn-settings: 'sdc-settings'
+ - "master":
+ branch: "master"
+ mvn-version: "mvn36"
+ mvn-settings: "sdc-settings"
java-version: openjdk11
- project:
@@ -125,6 +127,6 @@
project-name: sdc
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: sdc
branch: master
diff --git a/jjb/sdnc/sdnc-apps.yaml b/jjb/sdnc/sdnc-apps.yaml
index 05682b1..e491ac7 100644
--- a/jjb/sdnc/sdnc-apps.yaml
+++ b/jjb/sdnc/sdnc-apps.yaml
@@ -7,117 +7,96 @@
- project:
name: sdnc-apps
- project-name: 'sdnc-apps'
+ project-name: "sdnc-apps"
jobs:
- gerrit-maven-verify:
build-node: ubuntu1804-docker-8c-8g
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
- mvn-params: '-Ddocker.skip.push=true -Pdocker'
+ container-public-registry: "nexus3.onap.org:10001"
+ container-staging-registry: "nexus3.onap.org:10003"
+ mvn-params: "-Ddocker.skip.push=true -Pdocker"
- gerrit-maven-merge:
- cron: '@daily'
- mvn-params: '-Dmaven.test.skip=true'
+ cron: "@daily"
+ mvn-params: "-Dmaven.test.skip=true"
- gerrit-maven-stage:
- build-node: centos7-builder-4c-4g
+ build-node: centos8-docker-8c-8g
sign-artifacts: true
- mvn-params: '-Dmaven.test.skip=true'
- cron: ''
- sbom-generator: false
+ mvn-params: "-Dmaven.test.skip=true"
+ cron: ""
+ sbom-generator: true
- gerrit-maven-docker-stage:
build-node: ubuntu1804-docker-8c-8g
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
- mvn-params: '-Dmaven.test.skip=true -Pdocker'
+ container-public-registry: "nexus3.onap.org:10001"
+ container-staging-registry: "nexus3.onap.org:10003"
+ mvn-params: "-Dmaven.test.skip=true -Pdocker"
maven-versions-plugin: true
- cron: '@daily'
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
+ cron: "@daily"
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
- project: 'sdnc/apps'
+ project: "sdnc/apps"
stream:
- - 'master':
- branch: 'master'
- - 'istanbul':
- branch: 'istanbul'
- - 'jakarta':
- branch: 'jakarta'
- - 'kohn':
- branch: 'kohn'
- java-version: openjdk11
- mvn-version : "mvn38"
- mvn-settings: 'sdnc-apps-settings'
+ - "master":
+ branch: "master"
+ java-version: openjdk17
+ - "kohn":
+ branch: "kohn"
+ java-version: openjdk11
+ mvn-version: "mvn38"
+ mvn-settings: "sdnc-apps-settings"
# due to a strange macro / variable translation problem this needs to be
# passed as a string block to properly get the properties correctly defined
# in the job
maven-deploy-properties: |
deployAtEnd=true
- files: '**'
- archive-artifacts: ''
+ files: "**"
+ archive-artifacts: ""
maven-version: "mvn38"
build-node: ubuntu1804-builder-4c-4g
- mvn-snapshot-id: 'ecomp-snapshots'
- nexus-snapshot-repo: 'snapshots'
+ mvn-snapshot-id: "ecomp-snapshots"
+ nexus-snapshot-repo: "snapshots"
- project:
name: sdnc-apps-sonar
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
build-node: ubuntu1804-builder-4c-4g
- project: 'sdnc/apps'
- project-name: 'sdnc-apps'
- branch: 'master'
- java-version: openjdk11
- mvn-version : "mvn38"
- mvn-settings: 'sdnc-apps-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ project: "sdnc/apps"
+ project-name: "sdnc-apps"
+ branch: "master"
+ java-version: openjdk17
+ mvn-version: "mvn38"
+ mvn-settings: "sdnc-apps-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m"
maven-version: "mvn38"
-#
-#- project:
-# name: sdnc-apps-docker-arm64
-# project-name: 'sdnc-apps-arm64'
-# jobs:
-# - 'docker-version-java-daily':
-# docker-pom: 'pom.xml'
-# mvn-profile: 'docker'
-# mvn-params: '-Dmaven.test.skip=true'
-# project: 'sdnc/apps'
-# stream:
-# - 'master':
-# branch: 'master'
-# mvn-settings: 'sdnc-apps-settings'
-# files: '**'
-# archive-artifacts: ''
-# build-node: ubuntu1804-docker-arm64-4c-2g
-
- project:
name: sdnc-apps-clm
jobs:
- gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
+ nexus-iq-namespace: "onap-"
project: sdnc/apps
- project-name: 'sdnc-apps'
+ project-name: "sdnc-apps"
build-node: ubuntu1804-builder-4c-4g
stream:
- - 'master':
- branch: 'master'
- java-version: openjdk11
- mvn-version : "mvn38"
- mvn-settings: 'sdnc-apps-settings'
+ - "master":
+ branch: "master"
+ java-version: openjdk17
+ mvn-version: "mvn38"
+ mvn-settings: "sdnc-apps-settings"
+ mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED"
- project:
name: sdnc-apps-info
project-name: sdnc-apps
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: sdnc/apps
branch: master
diff --git a/jjb/sdnc/sdnc-csit.yaml b/jjb/sdnc/sdnc-csit.yaml
index bf5be3b..5575d8d 100644
--- a/jjb/sdnc/sdnc-csit.yaml
+++ b/jjb/sdnc/sdnc-csit.yaml
@@ -2,26 +2,22 @@
- project:
name: sdnc-oam-csit
jobs:
- - '{project-name}-review-verification-maven-{stream}':
- mvn-params: '-Dmaven.test.skip=true -Ddocker.skip.push=true -Pdocker'
+ - "{project-name}-review-verification-maven-{stream}":
+ mvn-params: "-Dmaven.test.skip=true -Ddocker.skip.push=true -Pdocker"
maven-versions-plugin: true
- - '{project-name}-merge-verification-maven-{stream}':
- mvn-params: '-Dmaven.test.skip=true -Ddocker.skip.push=true -Pdocker'
+ - "{project-name}-merge-verification-maven-{stream}":
+ mvn-params: "-Dmaven.test.skip=true -Ddocker.skip.push=true -Pdocker"
maven-versions-plugin: true
- project-name: 'sdnc-oam'
- recipients: 'dtimoney@att.com'
+ project-name: "sdnc-oam"
+ recipients: "dtimoney@att.com"
# project name in gerrit
- project: 'sdnc/oam'
+ project: "sdnc/oam"
stream:
- - 'master':
- branch: 'master'
- - 'istanbul':
- branch: 'istanbul'
- - 'jakarta':
- branch: 'jakarta'
- - 'kohn':
- branch: 'kohn'
- mvn-settings: 'sdnc-oam-settings'
- mvn-version: 'mvn38'
- robot-options: ''
- branch: 'master'
+ - "master":
+ branch: "master"
+ - "kohn":
+ branch: "kohn"
+ mvn-settings: "sdnc-oam-settings"
+ mvn-version: "mvn38"
+ robot-options: ""
+ branch: "master"
diff --git a/jjb/sdnc/sdnc-northbound.yaml b/jjb/sdnc/sdnc-northbound.yaml
index 3a6878d..64009dd 100644
--- a/jjb/sdnc/sdnc-northbound.yaml
+++ b/jjb/sdnc/sdnc-northbound.yaml
@@ -1,85 +1,82 @@
---
- project:
name: sdnc-northbound
- project-name: 'sdnc-northbound'
+ project-name: "sdnc-northbound"
jobs:
- gerrit-maven-verify
- gerrit-maven-merge:
- cron: '@daily'
+ cron: "@daily"
- gerrit-maven-stage:
sign-artifacts: true
- build-node: centos7-builder-4c-4g
- cron: ''
- sbom-generator: false
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
+ build-node: centos8-docker-8c-8g
+ cron: ""
+ sbom-generator: true
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
- project: 'sdnc/northbound'
+ project: "sdnc/northbound"
stream:
- - 'master':
- branch: 'master'
- - 'istanbul':
- branch: 'istanbul'
- - 'jakarta':
- branch: 'jakarta'
- - 'kohn':
- branch: 'kohn'
- java-version: openjdk11
+ - "master":
+ branch: "master"
+ java-version: openjdk17
+ - "kohn":
+ branch: "kohn"
+ java-version: openjdk11
mvn-version: "mvn38"
- mvn-settings: 'sdnc-northbound-settings'
+ mvn-settings: "sdnc-northbound-settings"
# due to a strange macro / variable translation problem this needs to be
# passed as a string block to properly get the properties correctly defined
# in the job
maven-deploy-properties: |
deployAtEnd=true
- files: '**'
- archive-artifacts: ''
+ files: "**"
+ archive-artifacts: ""
maven-version: "mvn38"
build-node: ubuntu1804-builder-4c-4g
- mvn-snapshot-id: 'ecomp-snapshots'
- nexus-snapshot-repo: 'snapshots'
+ mvn-snapshot-id: "ecomp-snapshots"
+ nexus-snapshot-repo: "snapshots"
- project:
name: sdnc-northbound-sonar
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
build-node: ubuntu1804-builder-4c-4g
- project: 'sdnc/northbound'
- project-name: 'sdnc-northbound'
- branch: 'master'
- mvn-settings: 'sdnc-northbound-settings'
- mvn-goals: 'clean install'
- java-version: openjdk11
+ project: "sdnc/northbound"
+ project-name: "sdnc-northbound"
+ branch: "master"
+ mvn-settings: "sdnc-northbound-settings"
+ mvn-goals: "clean install"
+ java-version: openjdk17
mvn-version: "mvn38"
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ mvn-opts: "-Xmx1024m"
- project:
name: sdnc-northbound-clm
jobs:
- gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
+ nexus-iq-namespace: "onap-"
project: sdnc/northbound
- project-name: 'sdnc-northbound'
+ project-name: "sdnc-northbound"
build-node: ubuntu1804-builder-4c-4g
stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'sdnc-northbound-settings'
- java-version: openjdk11
- mvn-version: 'mvn38'
+ - "master":
+ branch: "master"
+ mvn-settings: "sdnc-northbound-settings"
+ java-version: openjdk17
+ mvn-version: "mvn38"
+ mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED"
- project:
name: sdnc-northbound-info
project-name: sdnc-northbound
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: sdnc/northbound
branch: master
diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml
index 0ad1fed..561c13d 100644
--- a/jjb/sdnc/sdnc-oam.yaml
+++ b/jjb/sdnc/sdnc-oam.yaml
@@ -1,86 +1,67 @@
---
- project:
name: sdnc-oam
- project-name: 'sdnc-oam'
+ project-name: "sdnc-oam"
jobs:
- gerrit-maven-verify:
- cron: ''
+ cron: ""
- gerrit-maven-merge:
- cron: '@daily'
- mvn-params: '-Dmaven.test.skip=true'
+ cron: "@daily"
+ mvn-params: "-Dmaven.test.skip=true"
- gerrit-maven-stage:
- build-node: centos7-builder-4c-4g
+ build-node: centos8-docker-8c-8g
sign-artifacts: true
- mvn-params: '-Dmaven.test.skip=true'
- cron: ''
- sbom-generator: false
+ mvn-params: "-Dmaven.test.skip=true"
+ cron: ""
+ sbom-generator: true
- gerrit-maven-docker-stage:
- build-node: ubuntu1804-docker-8c-8g
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
- mvn-params: '-Dmaven.test.skip=true -Ddocker.skip.run=true -Pdocker'
+ build-node: centos8-docker-8c-8g
+ container-public-registry: "nexus3.onap.org:10001"
+ container-staging-registry: "nexus3.onap.org:10003"
+ mvn-params: "-Dmaven.test.skip=true -Ddocker.skip.run=true -Pdocker"
maven-versions-plugin: true
- cron: '@daily'
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
- project: 'sdnc/oam'
+ cron: "@daily"
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
+ project: "sdnc/oam"
stream:
- - 'master':
- branch: 'master'
- - 'istanbul':
- branch: 'istanbul'
- - 'jakarta':
- branch: 'jakarta'
- - 'kohn':
- branch: 'kohn'
- java-version: openjdk11
+ - "master":
+ branch: "master"
+ java-version: openjdk17
+ - "kohn":
+ branch: "kohn"
+ java-version: openjdk11
mvn-version: "mvn38"
- mvn-settings: 'sdnc-oam-settings'
- files: '**'
- archive-artifacts: ''
- build-node: ubuntu1804-builder-4c-4g
+ mvn-settings: "sdnc-oam-settings"
+ files: "**"
+ archive-artifacts: ""
+ sign-artifacts: true
+ build-node: centos8-docker-8c-8g
shallow-clone: true
- mvn-snapshot-id: 'ecomp-snapshots'
- nexus-snapshot-repo: 'snapshots'
-
-#
-#- project:
-# name: sdnc-oam-docker-arm64
-# project-name: 'sdnc-oam-arm64'
-# jobs:
-# - 'docker-version-java-daily':
-# docker-pom: 'pom.xml'
-# mvn-profile: 'docker'
-# mvn-params: '-Dmaven.test.skip=true'
-# project: 'sdnc/oam'
-# stream:
-# - 'master':
-# branch: 'master'
-# mvn-settings: 'sdnc-oam-settings'
-# files: '**'
-# archive-artifacts: ''
-# build-node: ubuntu1804-docker-arm64-4c-2g
+ mvn-snapshot-id: "ecomp-snapshots"
+ nexus-snapshot-repo: "snapshots"
- project:
name: sdnc-oam-clm
jobs:
- gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
+ nexus-iq-namespace: "onap-"
project: sdnc/oam
- project-name: 'sdnc-oam'
- build-node: ubuntu1804-builder-4c-4g
+ project-name: "sdnc-oam"
+ build-node: centos8-docker-8c-8g
stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'sdnc-oam-settings'
- java-version: openjdk11
- mvn-version: 'mvn38'
+ - "master":
+ branch: "master"
+ mvn-settings: "sdnc-oam-settings"
+ java-version: openjdk17
+ mvn-version: "mvn38"
+ mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED"
- project:
name: sdnc-oam-info
project-name: sdnc-oam
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: sdnc/oam
branch: master
diff --git a/jjb/so/so-adapters-so-cnf-adapter.yaml b/jjb/so/so-adapters-so-cnf-adapter.yaml
index e0f1fa1..5189c46 100644
--- a/jjb/so/so-adapters-so-cnf-adapter.yaml
+++ b/jjb/so/so-adapters-so-cnf-adapter.yaml
@@ -9,39 +9,38 @@
name: so-adapters-so-cnf-adapter-info
project: so/adapters/so-cnf-adapter
project-name: so-adapters-so-cnf-adapter
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
jobs:
- gerrit-info-yaml-verify
- project:
name: so-adapters-so-cnf-adapter
- project-name: 'so-adapters-so-cnf-adapter'
+ project-name: "so-adapters-so-cnf-adapter"
jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
+ - "{project-name}-{stream}-verify-java"
+ - "{project-name}-{stream}-merge-java"
- gerrit-maven-stage:
+ sbom-generator: true
sign-artifacts: true
- build-node: centos7-builder-4c-4g
+ build-node: centos8-docker-4c-4g
maven-versions-plugin: true
- gerrit-maven-docker-stage:
+ sbom-generator: true
build-node: ubuntu1804-docker-v1-8c-8g
maven-versions-plugin: true
- mvn-params: '-P docker -DskipTests'
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
- project: 'so/adapters/so-cnf-adapter'
+ mvn-params: "-P docker -DskipTests"
+ container-public-registry: "nexus3.onap.org:10001"
+ container-staging-registry: "nexus3.onap.org:10003"
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
+ project: "so/adapters/so-cnf-adapter"
stream:
- - 'master':
- branch: 'master'
+ - "master":
+ branch: "master"
java-version: openjdk11
- - 'honolulu':
- branch: 'honolulu'
- java-version: openjdk11
- mvn-settings: 'so-adapters-so-cnf-adapter-settings'
- files: '**'
- archive-artifacts: ''
+ mvn-settings: "so-adapters-so-cnf-adapter-settings"
+ files: "**"
+ archive-artifacts: ""
build-node: ubuntu1804-docker-v1-8c-8g
- project:
@@ -50,16 +49,29 @@
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
max-git-repo-age-hours: 48
build-node: ubuntu1804-docker-v1-8c-8g
- project: 'so/adapters/so-cnf-adapter'
- project-name: 'so-adapters-so-cnf-adapter'
- branch: 'master'
- mvn-settings: 'so-adapters-so-cnf-adapter-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ project: "so/adapters/so-cnf-adapter"
+ project-name: "so-adapters-so-cnf-adapter"
+ branch: "master"
+ mvn-settings: "so-adapters-so-cnf-adapter-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
+
+- project:
+ name: so-adapters-so-cnf-adapter-clm
+ java-version: openjdk11
+ jobs:
+ - gerrit-maven-clm
+ nexus-iq-namespace: "onap-"
+ project: "so/adapters/so-cnf-adapter"
+ project-name: "so-adapters-so-cnf-adapter"
+ build-node: ubuntu1804-docker-v1-8c-8g
+ stream:
+ - "master":
+ branch: "master"
+ mvn-settings: "so-adapters-so-cnf-adapter-settings"
diff --git a/jjb/so/so-adapters-so-etsi-sol003-adapter.yaml b/jjb/so/so-adapters-so-etsi-sol003-adapter.yaml
index 60412f7..3729559 100644
--- a/jjb/so/so-adapters-so-etsi-sol003-adapter.yaml
+++ b/jjb/so/so-adapters-so-etsi-sol003-adapter.yaml
@@ -9,42 +9,41 @@
name: so-adapters-so-etsi-sol003-adapter-info
project: so/adapters/so-etsi-sol003-adapter
project-name: so-adapters-so-etsi-sol003-adapter
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
jobs:
- gerrit-info-yaml-verify
- project:
name: so-adapters-so-etsi-sol003-adapter
- project-name: 'so-adapters-so-etsi-sol003-adapter'
+ project-name: "so-adapters-so-etsi-sol003-adapter"
jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
+ - "{project-name}-{stream}-verify-java"
+ - "{project-name}-{stream}-merge-java"
- gerrit-maven-stage:
+ sbom-generator: true
sign-artifacts: true
- build-node: centos7-builder-4c-4g
+ build-node: centos8-docker-4c-4g
maven-versions-plugin: true
- gerrit-maven-docker-stage:
+ sbom-generator: true
build-node: ubuntu1804-docker-v1-8c-8g
maven-versions-plugin: true
- mvn-params: '-P docker -DskipTests'
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
- project: 'so/adapters/so-etsi-sol003-adapter'
+ mvn-params: "-P docker -DskipTests"
+ container-public-registry: "nexus3.onap.org:10001"
+ container-staging-registry: "nexus3.onap.org:10003"
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
+ project: "so/adapters/so-etsi-sol003-adapter"
stream:
- - 'master':
- branch: 'master'
+ - "master":
+ branch: "master"
java-version: openjdk11
- - 'honolulu':
- branch: 'honolulu'
+ - "kohn":
+ branch: "kohn"
java-version: openjdk11
- - 'kohn':
- branch: 'kohn'
- java-version: openjdk11
- mvn-settings: 'so-adapters-so-etsi-sol003-adapter-settings'
- files: '**'
- archive-artifacts: ''
+ mvn-settings: "so-adapters-so-etsi-sol003-adapter-settings"
+ files: "**"
+ archive-artifacts: ""
build-node: ubuntu1804-docker-v1-8c-8g
- project:
@@ -53,30 +52,29 @@
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
max-git-repo-age-hours: 48
build-node: ubuntu1804-docker-v1-8c-8g
- project: 'so/adapters/so-etsi-sol003-adapter'
- project-name: 'so-adapters-so-etsi-sol003-adapter'
- branch: 'master'
- mvn-settings: 'so-adapters-so-etsi-sol003-adapter-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ project: "so/adapters/so-etsi-sol003-adapter"
+ project-name: "so-adapters-so-etsi-sol003-adapter"
+ branch: "master"
+ mvn-settings: "so-adapters-so-etsi-sol003-adapter-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
- project:
name: so-adapters-so-etsi-sol003-adapter-clm
java-version: openjdk11
jobs:
- gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
- project: 'so/adapters/so-etsi-sol003-adapter'
- project-name: 'so-adapters-so-etsi-sol003-adapter'
+ nexus-iq-namespace: "onap-"
+ project: "so/adapters/so-etsi-sol003-adapter"
+ project-name: "so-adapters-so-etsi-sol003-adapter"
build-node: ubuntu1804-docker-v1-8c-8g
stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'so-adapters-so-etsi-sol003-adapter-settings'
+ - "master":
+ branch: "master"
+ mvn-settings: "so-adapters-so-etsi-sol003-adapter-settings"
diff --git a/jjb/so/so-adapters-so-etsi-sol005-adapter.yaml b/jjb/so/so-adapters-so-etsi-sol005-adapter.yaml
index 2d1a8d5..0c75367 100644
--- a/jjb/so/so-adapters-so-etsi-sol005-adapter.yaml
+++ b/jjb/so/so-adapters-so-etsi-sol005-adapter.yaml
@@ -9,39 +9,38 @@
name: so-adapters-so-etsi-sol005-adapter-info
project: so/adapters/so-etsi-sol005-adapter
project-name: so-adapters-so-etsi-sol005-adapter
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
jobs:
- gerrit-info-yaml-verify
- project:
name: so-adapters-so-etsi-sol005-adapter
- project-name: 'so-adapters-so-etsi-sol005-adapter'
+ project-name: "so-adapters-so-etsi-sol005-adapter"
jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
+ - "{project-name}-{stream}-verify-java"
+ - "{project-name}-{stream}-merge-java"
- gerrit-maven-stage:
+ sbom-generator: true
sign-artifacts: true
- build-node: centos7-builder-4c-4g
+ build-node: centos8-docker-4c-4g
maven-versions-plugin: true
- gerrit-maven-docker-stage:
+ sbom-generator: true
build-node: ubuntu1804-docker-v1-8c-8g
maven-versions-plugin: true
- mvn-params: '-P docker -DskipTests'
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
- project: 'so/adapters/so-etsi-sol005-adapter'
+ mvn-params: "-P docker -DskipTests"
+ container-public-registry: "nexus3.onap.org:10001"
+ container-staging-registry: "nexus3.onap.org:10003"
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
+ project: "so/adapters/so-etsi-sol005-adapter"
stream:
- - 'master':
- branch: 'master'
+ - "master":
+ branch: "master"
java-version: openjdk11
- - 'honolulu':
- branch: 'honolulu'
- java-version: openjdk11
- mvn-settings: 'so-adapters-so-etsi-sol005-adapter-settings'
- files: '**'
- archive-artifacts: ''
+ mvn-settings: "so-adapters-so-etsi-sol005-adapter-settings"
+ files: "**"
+ archive-artifacts: ""
build-node: ubuntu1804-docker-v1-8c-8g
- project:
@@ -50,16 +49,29 @@
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
max-git-repo-age-hours: 48
build-node: ubuntu1804-docker-v1-8c-8g
- project: 'so/adapters/so-etsi-sol005-adapter'
- project-name: 'so-adapters-so-etsi-sol005-adapter'
- branch: 'master'
- mvn-settings: 'so-adapters-so-etsi-sol005-adapter-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ project: "so/adapters/so-etsi-sol005-adapter"
+ project-name: "so-adapters-so-etsi-sol005-adapter"
+ branch: "master"
+ mvn-settings: "so-adapters-so-etsi-sol005-adapter-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
+
+- project:
+ name: so-adapters-so-etsi-sol005-adapter-clm
+ java-version: openjdk11
+ jobs:
+ - gerrit-maven-clm
+ nexus-iq-namespace: "onap-"
+ project: "so/adapters/so-etsi-sol005-adapter"
+ project-name: "so-adapters-so-etsi-sol005-adapter"
+ build-node: ubuntu1804-docker-v1-8c-8g
+ stream:
+ - "master":
+ branch: "master"
+ mvn-settings: "so-adapters-so-etsi-sol005-adapter-settings"
diff --git a/jjb/so/so-adapters-so-nssmf-adapter.yaml b/jjb/so/so-adapters-so-nssmf-adapter.yaml
index b311dd5..e6c3546 100644
--- a/jjb/so/so-adapters-so-nssmf-adapter.yaml
+++ b/jjb/so/so-adapters-so-nssmf-adapter.yaml
@@ -9,45 +9,44 @@
name: so-adapters-so-nssmf-adapter-info
project: so/adapters/so-nssmf-adapter
project-name: so-adapters-so-nssmf-adapter
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
jobs:
- gerrit-info-yaml-verify
- project:
name: so-adapters-so-nssmf-adapter
- project-name: 'so-adapters-so-nssmf-adapter'
+ project-name: "so-adapters-so-nssmf-adapter"
jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
+ - "{project-name}-{stream}-verify-java"
+ - "{project-name}-{stream}-merge-java"
- gerrit-maven-stage:
+ sbom-generator: true
sign-artifacts: true
- build-node: centos7-builder-4c-4g
+ build-node: centos8-docker-4c-4g
maven-versions-plugin: true
- gerrit-maven-docker-stage:
+ sbom-generator: true
build-node: ubuntu1804-docker-v1-8c-8g
maven-versions-plugin: true
- mvn-params: '-P docker -DskipTests'
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
- project: 'so/adapters/so-nssmf-adapter'
+ mvn-params: "-P docker -DskipTests"
+ container-public-registry: "nexus3.onap.org:10001"
+ container-staging-registry: "nexus3.onap.org:10003"
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
+ project: "so/adapters/so-nssmf-adapter"
stream:
- - 'master':
- branch: 'master'
+ - "master":
+ branch: "master"
java-version: openjdk11
- - 'honolulu':
- branch: 'honolulu'
+ - "jakarta":
+ branch: "jakarta"
java-version: openjdk11
- - 'jakarta':
- branch: 'jakarta'
+ - "kohn":
+ branch: "kohn"
java-version: openjdk11
- - 'kohn':
- branch: 'kohn'
- java-version: openjdk11
- mvn-settings: 'so-adapters-so-nssmf-adapter-settings'
- files: '**'
- archive-artifacts: ''
+ mvn-settings: "so-adapters-so-nssmf-adapter-settings"
+ files: "**"
+ archive-artifacts: ""
build-node: ubuntu1804-docker-v1-8c-8g
- project:
@@ -56,16 +55,15 @@
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
max-git-repo-age-hours: 48
build-node: ubuntu1804-docker-v1-8c-8g
- project: 'so/adapters/so-nssmf-adapter'
- project-name: 'so-adapters-so-nssmf-adapter'
- branch: 'master'
- mvn-settings: 'so-adapters-so-nssmf-adapter-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ project: "so/adapters/so-nssmf-adapter"
+ project-name: "so-adapters-so-nssmf-adapter"
+ branch: "master"
+ mvn-settings: "so-adapters-so-nssmf-adapter-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
diff --git a/jjb/so/so-adapters-so-oof-adapter.yaml b/jjb/so/so-adapters-so-oof-adapter.yaml
index 2138fcf..16d0a58 100644
--- a/jjb/so/so-adapters-so-oof-adapter.yaml
+++ b/jjb/so/so-adapters-so-oof-adapter.yaml
@@ -9,39 +9,38 @@
name: so-adapters-so-oof-adapter-info
project: so/adapters/so-oof-adapter
project-name: so-adapters-so-oof-adapter
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
jobs:
- gerrit-info-yaml-verify
- project:
name: so-adapters-so-oof-adapter
- project-name: 'so-adapters-so-oof-adapter'
+ project-name: "so-adapters-so-oof-adapter"
jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
+ - "{project-name}-{stream}-verify-java"
+ - "{project-name}-{stream}-merge-java"
- gerrit-maven-stage:
+ sbom-generator: true
sign-artifacts: true
- build-node: centos7-builder-4c-4g
+ build-node: centos8-docker-4c-4g
maven-versions-plugin: true
- gerrit-maven-docker-stage:
+ sbom-generator: true
build-node: ubuntu1804-docker-v1-8c-8g
maven-versions-plugin: true
- mvn-params: '-P docker -DskipTests'
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
- project: 'so/adapters/so-oof-adapter'
+ mvn-params: "-P docker -DskipTests"
+ container-public-registry: "nexus3.onap.org:10001"
+ container-staging-registry: "nexus3.onap.org:10003"
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
+ project: "so/adapters/so-oof-adapter"
stream:
- - 'master':
- branch: 'master'
+ - "master":
+ branch: "master"
java-version: openjdk11
- - 'honolulu':
- branch: 'honolulu'
- java-version: openjdk11
- mvn-settings: 'so-adapters-so-oof-adapter-settings'
- files: '**'
- archive-artifacts: ''
+ mvn-settings: "so-adapters-so-oof-adapter-settings"
+ files: "**"
+ archive-artifacts: ""
build-node: ubuntu1804-docker-v1-8c-8g
- project:
@@ -50,16 +49,29 @@
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
max-git-repo-age-hours: 48
build-node: ubuntu1804-docker-v1-8c-8g
- project: 'so/adapters/so-oof-adapter'
- project-name: 'so-adapters-so-oof-adapter'
- branch: 'master'
- mvn-settings: 'so-adapters-so-oof-adapter-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ project: "so/adapters/so-oof-adapter"
+ project-name: "so-adapters-so-oof-adapter"
+ branch: "master"
+ mvn-settings: "so-adapters-so-oof-adapter-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
+
+- project:
+ name: so-adapters-so-oof-adapter-clm
+ java-version: openjdk11
+ jobs:
+ - gerrit-maven-clm
+ nexus-iq-namespace: "onap-"
+ project: "so/adapters/so-oof-adapter"
+ project-name: "so-adapters-so-oof-adapter"
+ build-node: ubuntu1804-docker-v1-8c-8g
+ stream:
+ - "master":
+ branch: "master"
+ mvn-settings: "so-adapters-so-oof-adapter-settings"
diff --git a/jjb/so/so-csit.yaml b/jjb/so/so-csit.yaml
index 0ff396d..1bda2bd 100644
--- a/jjb/so/so-csit.yaml
+++ b/jjb/so/so-csit.yaml
@@ -3,23 +3,22 @@
name: so-csit
java-version: openjdk11
jobs:
- - '{project-name}-{stream}-verify-csit-{functionality}'
- - '{project-name}-{stream}-csit-{functionality}'
- project-name: 'so'
- recipients: 'seshu.kumar.m@huawei.com'
+ - "{project-name}-{stream}-verify-csit-{functionality}"
+ - "{project-name}-{stream}-csit-{functionality}"
+ project-name: "so"
+ recipients: "seshu.kumar.m@huawei.com"
stream:
- - 'master':
- branch: 'master'
+ - "master":
+ branch: "master"
java-version: openjdk11
- - 'honolulu':
- branch: 'honolulu'
- java-version: openjdk11
- - 'Custom_Workflow':
- branch: 'Custom_Workflow'
+ - "Custom_Workflow":
+ branch: "Custom_Workflow"
java-version: openjdk11
functionality:
- - 'integration-etsi-testing':
+ - "integration-etsi-testing":
trigger_jobs:
- - 'macroflow':
+ - "macroflow":
trigger_jobs:
- robot-options: ''
+ - "integration-cnfm-testing":
+ trigger_jobs:
+ robot-options: ""
diff --git a/jjb/so/so-libs.yaml b/jjb/so/so-libs.yaml
index 9846475..b5b11ed 100644
--- a/jjb/so/so-libs.yaml
+++ b/jjb/so/so-libs.yaml
@@ -1,32 +1,30 @@
---
- project:
name: so-libs
- project-name: 'so-libs'
+ project-name: "so-libs"
jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
+ - "{project-name}-{stream}-verify-java"
+ - "{project-name}-{stream}-merge-java"
- gerrit-maven-stage:
+ sbom-generator: true
sign-artifacts: true
- build-node: centos7-builder-4c-4g
+ build-node: centos8-docker-4c-4g
maven-versions-plugin: true
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
- project: 'so/libs'
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
+ project: "so/libs"
stream:
- - 'master':
- branch: 'master'
+ - "master":
+ branch: "master"
java-version: openjdk11
- - 'honolulu':
- branch: 'honolulu'
- java-version: openjdk11
- mvn-settings: 'so-libs-settings'
+ mvn-settings: "so-libs-settings"
# due to a strange macro / variable translation problem this needs to be
# passed as a string block to properly get the properties correctly defined
# in the job
maven-deploy-properties: |
deployAtEnd=true
- files: '**'
- archive-artifacts: ''
+ files: "**"
+ archive-artifacts: ""
- project:
name: so-libs-sonar
@@ -34,31 +32,28 @@
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
build-node: ubuntu1804-builder-4c-4g
- project: 'so/libs'
- project-name: 'so-libs'
- java-version: openjdk11
- branch: 'master'
- mvn-settings: 'so-libs-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ project: "so/libs"
+ project-name: "so-libs"
+ branch: "master"
+ mvn-settings: "so-libs-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
- project:
name: so-libs-clm
java-version: openjdk11
jobs:
- gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
+ nexus-iq-namespace: "onap-"
project: so/libs
- project-name: 'so-libs'
- java-version: openjdk11
- branch: 'master'
- mvn-settings: 'so-libs-settings'
+ project-name: "so-libs"
+ branch: "master"
+ mvn-settings: "so-libs-settings"
- project:
name: so-libs-info
@@ -66,6 +61,6 @@
java-version: openjdk11
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: so/libs
branch: master
diff --git a/jjb/so/so-so-admin-cockpit.yaml b/jjb/so/so-so-admin-cockpit.yaml
index 7e56144..fec0a4b 100644
--- a/jjb/so/so-so-admin-cockpit.yaml
+++ b/jjb/so/so-so-admin-cockpit.yaml
@@ -9,39 +9,38 @@
name: so-so-admin-cockpit-info
project: so/so-admin-cockpit
project-name: so-so-admin-cockpit
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
jobs:
- gerrit-info-yaml-verify
- project:
name: so-so-admin-cockpit
- project-name: 'so-so-admin-cockpit'
+ project-name: "so-so-admin-cockpit"
jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
+ - "{project-name}-{stream}-verify-java"
+ - "{project-name}-{stream}-merge-java"
- gerrit-maven-stage:
+ sbom-generator: true
sign-artifacts: true
- build-node: centos7-builder-4c-4g
+ build-node: centos8-docker-4c-4g
maven-versions-plugin: true
- gerrit-maven-docker-stage:
+ sbom-generator: true
build-node: ubuntu1804-docker-v1-8c-8g
maven-versions-plugin: true
- mvn-params: '-P docker -DskipTests'
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
- project: 'so/so-admin-cockpit'
+ mvn-params: "-P docker -DskipTests"
+ container-public-registry: "nexus3.onap.org:10001"
+ container-staging-registry: "nexus3.onap.org:10003"
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
+ project: "so/so-admin-cockpit"
stream:
- - 'master':
- branch: 'master'
+ - "master":
+ branch: "master"
java-version: openjdk11
- - 'honolulu':
- branch: 'honolulu'
- java-version: openjdk11
- mvn-settings: 'so-so-admin-cockpit-settings'
- files: '**'
- archive-artifacts: ''
+ mvn-settings: "so-so-admin-cockpit-settings"
+ files: "**"
+ archive-artifacts: ""
build-node: ubuntu1804-docker-v1-8c-8g
- project:
@@ -50,36 +49,35 @@
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
max-git-repo-age-hours: 48
build-node: ubuntu1804-docker-v1-8c-8g
- project: 'so/so-admin-cockpit'
- project-name: 'so-so-admin-cockpit'
- branch: 'master'
- mvn-settings: 'so-so-admin-cockpit-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ project: "so/so-admin-cockpit"
+ project-name: "so-so-admin-cockpit"
+ branch: "master"
+ mvn-settings: "so-so-admin-cockpit-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
- project:
- name: 'so-so-admin-cockpit-coverity'
+ name: "so-so-admin-cockpit-coverity"
java-version: openjdk11
jobs:
- - 'onap-gerrit-maven-coverity'
- cron: '@daily'
- build-node: 'ubuntu1804-docker-v1-8c-8g'
- project: 'so/so-admin-cockpit'
- project-name: 'so-so-admin-cockpit'
- branch: 'master'
- mvn-settings: 'so-so-admin-cockpit-settings'
- mvn-params: '-DskipTests'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
- coverity-project-name: 'onap-so'
- coverity-token: 'SrGGJp9T1n1lhJn2sF72XQ'
- coverity-user-email: 'A.Naluzhnyy@samsung.com'
+ - "onap-gerrit-maven-coverity"
+ cron: "@daily"
+ build-node: "ubuntu1804-docker-v1-8c-8g"
+ project: "so/so-admin-cockpit"
+ project-name: "so-so-admin-cockpit"
+ branch: "master"
+ mvn-settings: "so-so-admin-cockpit-settings"
+ mvn-params: "-DskipTests"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
+ coverity-project-name: "onap-so"
+ coverity-token: "SrGGJp9T1n1lhJn2sF72XQ"
+ coverity-user-email: "A.Naluzhnyy@samsung.com"
coverity-search-paths: >
so-admin-cockpit-monitoring-workflow/so-admin-cockpit-monitoring-workflow-ui/src/main/frontend/src
coverity-search-exclude-regexs: >
@@ -98,11 +96,11 @@
java-version: openjdk11
jobs:
- gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
- project: 'so/so-admin-cockpit'
- project-name: 'so-so-admin-cockpit'
+ nexus-iq-namespace: "onap-"
+ project: "so/so-admin-cockpit"
+ project-name: "so-so-admin-cockpit"
build-node: ubuntu1804-docker-v1-8c-8g
stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'so-so-admin-cockpit-settings'
+ - "master":
+ branch: "master"
+ mvn-settings: "so-so-admin-cockpit-settings"
diff --git a/jjb/so/so-so-etsi-nfvo.yaml b/jjb/so/so-so-etsi-nfvo.yaml
index 5a54d93..4738935 100644
--- a/jjb/so/so-so-etsi-nfvo.yaml
+++ b/jjb/so/so-so-etsi-nfvo.yaml
@@ -9,39 +9,38 @@
name: so-so-etsi-nfvo-info
project: so/so-etsi-nfvo
project-name: so-so-etsi-nfvo
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
jobs:
- gerrit-info-yaml-verify
- project:
name: so-so-etsi-nfvo
- project-name: 'so-so-etsi-nfvo'
+ project-name: "so-so-etsi-nfvo"
jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
+ - "{project-name}-{stream}-verify-java"
+ - "{project-name}-{stream}-merge-java"
- gerrit-maven-stage:
+ sbom-generator: true
sign-artifacts: true
- build-node: centos7-builder-4c-4g
+ build-node: centos8-docker-4c-4g
maven-versions-plugin: true
- gerrit-maven-docker-stage:
+ sbom-generator: true
build-node: ubuntu1804-docker-v1-8c-8g
maven-versions-plugin: true
- mvn-params: '-P docker -DskipTests'
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
- project: 'so/so-etsi-nfvo'
+ mvn-params: "-P docker -DskipTests"
+ container-public-registry: "nexus3.onap.org:10001"
+ container-staging-registry: "nexus3.onap.org:10003"
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
+ project: "so/so-etsi-nfvo"
stream:
- - 'master':
- branch: 'master'
+ - "master":
+ branch: "master"
java-version: openjdk11
- - 'honolulu':
- branch: 'honolulu'
- java-version: openjdk11
- mvn-settings: 'so-so-etsi-nfvo-settings'
- files: '**'
- archive-artifacts: ''
+ mvn-settings: "so-so-etsi-nfvo-settings"
+ files: "**"
+ archive-artifacts: ""
build-node: ubuntu1804-docker-v1-8c-8g
- project:
@@ -50,30 +49,29 @@
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
max-git-repo-age-hours: 48
build-node: ubuntu1804-docker-v1-8c-8g
- project: 'so/so-etsi-nfvo'
- project-name: 'so-so-etsi-nfvo'
- branch: 'master'
- mvn-settings: 'so-so-etsi-nfvo-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ project: "so/so-etsi-nfvo"
+ project-name: "so-so-etsi-nfvo"
+ branch: "master"
+ mvn-settings: "so-so-etsi-nfvo-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
- project:
name: so-so-etsi-nfvo-clm
java-version: openjdk11
jobs:
- gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
- project: 'so/so-etsi-nfvo'
- project-name: 'so-so-etsi-nfvo'
+ nexus-iq-namespace: "onap-"
+ project: "so/so-etsi-nfvo"
+ project-name: "so-so-etsi-nfvo"
build-node: ubuntu1804-docker-v1-8c-8g
stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'so-so-etsi-nfvo-settings'
+ - "master":
+ branch: "master"
+ mvn-settings: "so-so-etsi-nfvo-settings"
diff --git a/jjb/so/so.yaml b/jjb/so/so.yaml
index 43609ca..0c70f2f 100644
--- a/jjb/so/so.yaml
+++ b/jjb/so/so.yaml
@@ -8,39 +8,41 @@
- project:
name: so
- project-name: 'so'
+ project-name: "so"
jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
+ - "{project-name}-{stream}-verify-java"
+ - "{project-name}-{stream}-merge-java"
- gerrit-maven-stage:
+ sbom-generator: true
sign-artifacts: true
- build-node: centos7-builder-4c-4g
+ build-node: centos8-docker-4c-4g
maven-versions-plugin: true
- gerrit-maven-docker-stage:
+ sbom-generator: true
build-node: ubuntu1804-docker-v1-8c-8g
maven-versions-plugin: true
- mvn-params: '-P docker -DskipTests'
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
- project: 'so'
+ mvn-params: "-P docker -DskipTests"
+ container-public-registry: "nexus3.onap.org:10001"
+ container-staging-registry: "nexus3.onap.org:10003"
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
+ project: "so"
stream:
- - 'master':
- branch: 'master'
+ - "master":
+ branch: "master"
java-version: openjdk11
- - 'jakarta':
- branch: 'jakarta'
+ - "jakarta":
+ branch: "jakarta"
java-version: openjdk11
- - 'kohn':
- branch: 'kohn'
+ - "kohn":
+ branch: "kohn"
java-version: openjdk11
- - 'recursive-orch':
- branch: 'recursive-orch'
+ - "recursive-orch":
+ branch: "recursive-orch"
java-version: openjdk11
- mvn-settings: 'so-settings'
- files: '**'
- archive-artifacts: ''
+ mvn-settings: "so-settings"
+ files: "**"
+ archive-artifacts: ""
build-node: ubuntu1804-docker-v1-8c-8g
- project:
@@ -49,36 +51,35 @@
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
max-git-repo-age-hours: 48
build-node: ubuntu1804-docker-v1-8c-8g
- project: 'so'
- project-name: 'so'
- branch: 'master'
- mvn-settings: 'so-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ project: "so"
+ project-name: "so"
+ branch: "master"
+ mvn-settings: "so-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
- project:
- name: 'so-coverity'
+ name: "so-coverity"
java-version: openjdk11
jobs:
- - 'onap-gerrit-maven-coverity'
- cron: '@daily'
- build-node: 'ubuntu1804-docker-v1-8c-8g'
- project: 'so'
- project-name: 'so'
- branch: 'master'
- mvn-settings: 'so-settings'
- mvn-params: '-DskipTests'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
- coverity-project-name: 'onap-so'
- coverity-token: 'SrGGJp9T1n1lhJn2sF72XQ'
- coverity-user-email: 'A.Naluzhnyy@samsung.com'
+ - "onap-gerrit-maven-coverity"
+ cron: "@daily"
+ build-node: "ubuntu1804-docker-v1-8c-8g"
+ project: "so"
+ project-name: "so"
+ branch: "master"
+ mvn-settings: "so-settings"
+ mvn-params: "-DskipTests"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
+ coverity-project-name: "onap-so"
+ coverity-token: "SrGGJp9T1n1lhJn2sF72XQ"
+ coverity-user-email: "A.Naluzhnyy@samsung.com"
coverity-search-paths: >
so-monitoring/so-monitoring-ui/src/main/frontend/src
coverity-search-exclude-regexs: >
@@ -97,14 +98,14 @@
java-version: openjdk11
jobs:
- gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
+ nexus-iq-namespace: "onap-"
project: so
- project-name: 'so'
+ project-name: "so"
build-node: ubuntu1804-docker-v1-8c-8g
stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'so-settings'
+ - "master":
+ branch: "master"
+ mvn-settings: "so-settings"
- project:
name: so-info
@@ -112,15 +113,15 @@
java-version: openjdk11
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: so
stream:
- - 'master':
- branch: 'master'
+ - "master":
+ branch: "master"
java-version: openjdk11
- - 'jakarta':
- branch: 'jakarta'
+ - "jakarta":
+ branch: "jakarta"
java-version: openjdk11
- - 'kohn':
- branch: 'kohn'
+ - "kohn":
+ branch: "kohn"
java-version: openjdk11
diff --git a/jjb/testsuite/pythonsdk-tests/testsuite-pythonsdk-tests.yaml b/jjb/testsuite/pythonsdk-tests/testsuite-pythonsdk-tests.yaml
index 1486ba9..80e4a1b 100644
--- a/jjb/testsuite/pythonsdk-tests/testsuite-pythonsdk-tests.yaml
+++ b/jjb/testsuite/pythonsdk-tests/testsuite-pythonsdk-tests.yaml
@@ -4,46 +4,42 @@
project-name: testsuite-pythonsdk-tests
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: testsuite/pythonsdk-tests
branch: master
- project:
name: testsuite-pythonsdk-tests-linters
- project: 'testsuite/pythonsdk-tests'
- project-name: 'testsuite-pythonsdk-tests'
+ project: "testsuite/pythonsdk-tests"
+ project-name: "testsuite-pythonsdk-tests"
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'
- - 'rst':
- tox-dir: '.'
- tox-envs: 'rst'
- pattern: '**/*.rst'
- - 'md':
- tox-dir: '.'
- tox-envs: 'md'
- pattern: '**/*.md'
+ - "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"
+ - "rst":
+ tox-dir: "."
+ tox-envs: "rst"
+ pattern: "**/*.rst"
+ - "md":
+ tox-dir: "."
+ tox-envs: "md"
+ pattern: "**/*.md"
stream:
- - 'master':
- branch: 'master'
- - 'honolulu':
- branch: 'honolulu'
- - 'guilin':
- branch: 'guilin'
+ - "master":
+ branch: "master"
diff --git a/jjb/testsuite/robot-utils/testsuite-robot-utils.yaml b/jjb/testsuite/robot-utils/testsuite-robot-utils.yaml
index 7a4ad4d..ea463b6 100644
--- a/jjb/testsuite/robot-utils/testsuite-robot-utils.yaml
+++ b/jjb/testsuite/robot-utils/testsuite-robot-utils.yaml
@@ -9,6 +9,6 @@
name: testsuite-robot-utils-info
project: testsuite/robot-utils
project-name: testsuite-robot-utils
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
jobs:
- gerrit-info-yaml-verify
diff --git a/jjb/testsuite/testsuite-cds-mock-odl.yaml b/jjb/testsuite/testsuite-cds-mock-odl.yaml
index 65c818c..6ac6511 100644
--- a/jjb/testsuite/testsuite-cds-mock-odl.yaml
+++ b/jjb/testsuite/testsuite-cds-mock-odl.yaml
@@ -9,62 +9,62 @@
name: testsuite-cds-mock-odl-info
project: testsuite/cds-mock-odl
project-name: testsuite-cds-mock-odl
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
jobs:
- gerrit-info-yaml-verify
- project:
name: testsuite-cds-mock-odl-linters
- project: 'testsuite/cds-mock-odl'
- project-name: 'testsuite-cds-mock-odl'
+ project: "testsuite/cds-mock-odl"
+ project-name: "testsuite-cds-mock-odl"
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'
+ - "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'
+ - "master":
+ branch: "master"
- project:
- name: 'testsuite-cds-mock-odl-docker'
+ name: "testsuite-cds-mock-odl-docker"
jobs:
- gerrit-docker-verify:
- project-name: 'testsuite-cds-mock-odl'
+ project-name: "testsuite-cds-mock-odl"
docker-root: .
- docker-name: 'onap/cds-mock-odl'
- docker-build-args: '-f ./docker/Dockerfile'
+ docker-name: "onap/cds-mock-odl"
+ docker-build-args: "-f ./docker/Dockerfile"
- gerrit-docker-merge:
- project-name: 'testsuite-cds-mock-odl'
+ project-name: "testsuite-cds-mock-odl"
docker-root: .
- docker-name: 'onap/cds-mock-odl'
- docker-build-args: '-f ./docker/Dockerfile'
- project: 'testsuite/cds-modk-odl'
+ docker-name: "onap/cds-mock-odl"
+ docker-build-args: "-f ./docker/Dockerfile"
+ project: "testsuite/cds-modk-odl"
stream:
- - 'master':
- branch: 'master'
- files: ''
- docker-root: '$WORKSPACE'
- mvn-settings: 'testsuite-cds-mock-odl-settings'
+ - "master":
+ branch: "master"
+ files: ""
+ docker-root: "$WORKSPACE"
+ mvn-settings: "testsuite-cds-mock-odl-settings"
build-node: ubuntu1804-docker-8c-8g
- cron: '@daily'
+ cron: "@daily"
container-tag-method: stream
diff --git a/jjb/testsuite/testsuite-cds-mock-server.yaml b/jjb/testsuite/testsuite-cds-mock-server.yaml
index c6bc7a3..e2aa1c6 100644
--- a/jjb/testsuite/testsuite-cds-mock-server.yaml
+++ b/jjb/testsuite/testsuite-cds-mock-server.yaml
@@ -9,39 +9,38 @@
name: testsuite-cds-mock-server-info
project: testsuite/cds-mock-server
project-name: testsuite-cds-mock-server
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
jobs:
- gerrit-info-yaml-verify
- project:
name: testsuite-cds-mock-server-linters
- project: 'testsuite/cds-mock-server'
- project-name: 'testsuite-cds-mock-server'
+ project: "testsuite/cds-mock-server"
+ project-name: "testsuite-cds-mock-server"
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'
+ - "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'
-
+ - "master":
+ branch: "master"
diff --git a/jjb/testsuite/testsuite-cds-mock-ssh.yaml b/jjb/testsuite/testsuite-cds-mock-ssh.yaml
index 9fad20f..1812bc7 100644
--- a/jjb/testsuite/testsuite-cds-mock-ssh.yaml
+++ b/jjb/testsuite/testsuite-cds-mock-ssh.yaml
@@ -9,39 +9,38 @@
name: testsuite-cds-mock-ssh-info
project: testsuite/cds-mock-ssh
project-name: testsuite-cds-mock-ssh
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
jobs:
- gerrit-info-yaml-verify
- project:
name: testsuite-cds-mock-ssh-linters
- project: 'testsuite/cds-mock-ssh'
- project-name: 'testsuite-cds-mock-ssh'
+ project: "testsuite/cds-mock-ssh"
+ project-name: "testsuite-cds-mock-ssh"
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'
+ - "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'
-
+ - "master":
+ branch: "master"
diff --git a/jjb/testsuite/testsuite-cds.yaml b/jjb/testsuite/testsuite-cds.yaml
index 2fef96a..ac69952 100644
--- a/jjb/testsuite/testsuite-cds.yaml
+++ b/jjb/testsuite/testsuite-cds.yaml
@@ -3,38 +3,38 @@
name: testsuite-cds-info
project: testsuite/cds
project-name: testsuite-cds
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
jobs:
- gerrit-info-yaml-verify
- project:
name: testsuite-cds-linters
- project: 'testsuite/cds'
- project-name: 'testsuite-cds'
+ 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'
+ - "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'
+ - "master":
+ branch: "master"
diff --git a/jjb/testsuite/testsuite-docker.sh b/jjb/testsuite/testsuite-docker.sh
index ca5e95a..2ac6436 100644
--- a/jjb/testsuite/testsuite-docker.sh
+++ b/jjb/testsuite/testsuite-docker.sh
@@ -2,7 +2,7 @@
#
echo '============== CALLING SCRIPT TO CREATE DOCKER IMAGES ================='
cp $WORKSPACE/docker/* .
-docker -D build -t onap/testsuite .
+docker -D build --no-cache -t onap/testsuite .
export REPO="nexus3.onap.org:10003"
DATETIME_STAMP=$(date +%Y%m%dT%H%M%S)
diff --git a/jjb/testsuite/testsuite-oom.yaml b/jjb/testsuite/testsuite-oom.yaml
index 40b281a..a5b86f5 100644
--- a/jjb/testsuite/testsuite-oom.yaml
+++ b/jjb/testsuite/testsuite-oom.yaml
@@ -4,7 +4,6 @@
project-name: testsuite-oom
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: testsuite/oom
branch: master
-
diff --git a/jjb/testsuite/testsuite-python-testing-utils.yaml b/jjb/testsuite/testsuite-python-testing-utils.yaml
index e4983fd..69de692 100644
--- a/jjb/testsuite/testsuite-python-testing-utils.yaml
+++ b/jjb/testsuite/testsuite-python-testing-utils.yaml
@@ -1,39 +1,39 @@
---
- project:
name: testsuite-python-testing-utils
- project-name: 'testsuite-python-testing-utils'
+ project-name: "testsuite-python-testing-utils"
python-version: python3
jobs:
- - '{project-name}-{subproject}-python-staging-{stream}'
- - '{project-name}-{subproject}-python-release-{stream}'
- project: 'testsuite/python-testing-utils'
+ - "{project-name}-{subproject}-python-staging-{stream}"
+ - "{project-name}-{subproject}-python-release-{stream}"
+ project: "testsuite/python-testing-utils"
subproject:
- - 'robotframework-onap':
- tox-dir: './robotframework-onap/'
- tox-envs: 'py3'
+ - "robotframework-onap":
+ tox-dir: "./robotframework-onap/"
+ tox-envs: "py3"
stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'testsuite-python-testing-utils-settings'
- files: '**'
- archive-artifacts: ''
- build-node: 'ubuntu1804-builder-4c-4g'
+ - "master":
+ branch: "master"
+ mvn-settings: "testsuite-python-testing-utils-settings"
+ files: "**"
+ archive-artifacts: ""
+ build-node: "ubuntu1804-builder-4c-4g"
- project:
name: testsuite-python-testing-utils-verify
- project-name: 'testsuite-python-testing-utils'
- project: 'testsuite/python-testing-utils'
+ project-name: "testsuite-python-testing-utils"
+ project: "testsuite/python-testing-utils"
stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'testsuite-python-testing-utils-settings'
- build-node: 'ubuntu1804-builder-4c-4g'
+ - "master":
+ branch: "master"
+ mvn-settings: "testsuite-python-testing-utils-settings"
+ build-node: "ubuntu1804-builder-4c-4g"
subproject:
- - 'robotframework-onap':
- path: 'robotframework-onap'
- pattern: 'robotframework-onap/**'
+ - "robotframework-onap":
+ path: "robotframework-onap"
+ pattern: "robotframework-onap/**"
jobs:
- - '{project-name}-{stream}-{subproject}-verify-python'
+ - "{project-name}-{stream}-{subproject}-verify-python"
- project:
name: testsuite-python-testing-utils-info
diff --git a/jjb/testsuite/testsuite.yaml b/jjb/testsuite/testsuite.yaml
index 0ea7129..827aec9 100644
--- a/jjb/testsuite/testsuite.yaml
+++ b/jjb/testsuite/testsuite.yaml
@@ -7,69 +7,60 @@
- project:
name: testsuite-release
- project-name: 'testsuite'
- project: 'testsuite'
- mvn-settings: 'testsuite-settings'
+ project-name: "testsuite"
+ project: "testsuite"
+ mvn-settings: "testsuite-settings"
jobs:
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
- project:
name: testsuite
- project-name: 'testsuite'
+ project-name: "testsuite"
jobs:
- - '{project-name}-{stream}-3scm-docker-shell-daily':
- script:
- !include-raw-escape: 'testsuite-docker.sh'
+ - "{project-name}-{stream}-3scm-docker-shell-daily":
+ script: !include-raw-escape: "testsuite-docker.sh"
- project: 'testsuite'
+ project: "testsuite"
stream:
- - 'master':
- branch: 'master'
- - 'honolulu':
- branch: 'honolulu'
- - 'guilin':
- branch: 'guilin'
- mvn-settings: 'testsuite-settings'
+ - "master":
+ branch: "master"
+ mvn-settings: "testsuite-settings"
- project:
name: testsuite-info
project-name: testsuite
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: testsuite
branch: master
- project:
name: testsuite-linters
- project: 'testsuite'
- project-name: 'testsuite'
+ project: "testsuite"
+ project-name: "testsuite"
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'
- - 'robot':
- tox-dir: '.'
- tox-envs: 'robot'
- pattern: 'robot/testsuites/usecases/*.robot'
+ - "yaml":
+ tox-dir: "."
+ tox-envs: "yaml"
+ pattern: "**/*.yaml"
+ - "yml":
+ tox-dir: "."
+ tox-envs: "yaml"
+ pattern: "**/*.yml"
+ - "json":
+ tox-dir: "."
+ tox-envs: "json"
+ pattern: "**/*.json"
+ - "robot":
+ tox-dir: "."
+ tox-envs: "robot"
+ pattern: "robot/testsuites/usecases/*.robot"
stream:
- - 'master':
- branch: 'master'
- - 'honolulu':
- branch: 'honolulu'
- - 'guilin':
- branch: 'guilin'
+ - "master":
+ branch: "master"
diff --git a/jjb/usecases/usecases-csit.yaml b/jjb/usecases/usecases-csit.yaml
index edf34bb..0c46a4b 100644
--- a/jjb/usecases/usecases-csit.yaml
+++ b/jjb/usecases/usecases-csit.yaml
@@ -2,30 +2,30 @@
- project:
name: usecases-pnf-sw-upgrade
jobs:
- - '{project-name}-{stream}-verify-csit-{functionality}'
- - '{project-name}-{stream}-csit-{functionality}'
- project-name: 'usecases-pnf-sw-upgrade'
- recipients: 'morgan.richomm@orange.com bf1936@att.com rahul.tyagi@est.tech'
+ - "{project-name}-{stream}-verify-csit-{functionality}"
+ - "{project-name}-{stream}-csit-{functionality}"
+ project-name: "usecases-pnf-sw-upgrade"
+ recipients: "morgan.richomm@orange.com bf1936@att.com rahul.tyagi@est.tech"
stream:
- - 'master':
- branch: 'master'
+ - "master":
+ branch: "master"
functionality:
- - 'pnf-sw-upgrade':
+ - "pnf-sw-upgrade":
trigger_jobs:
- robot-options: ''
- disabled: 'true'
+ robot-options: ""
+ disabled: "true"
- project:
name: usecases-config-over-netconf
jobs:
- - '{project-name}-{stream}-verify-csit-{functionality}'
- - '{project-name}-{stream}-csit-{functionality}'
- project-name: 'usecases-config-over-netconf'
- recipients: 'morgan.richomm@orange.com bf1936@att.com rahul.tyagi@est.tech'
+ - "{project-name}-{stream}-verify-csit-{functionality}"
+ - "{project-name}-{stream}-csit-{functionality}"
+ project-name: "usecases-config-over-netconf"
+ recipients: "morgan.richomm@orange.com bf1936@att.com rahul.tyagi@est.tech"
stream:
- - 'master':
- branch: 'master'
+ - "master":
+ branch: "master"
functionality:
- - 'config-over-netconf':
+ - "config-over-netconf":
trigger_jobs:
- robot-options: ''
+ robot-options: ""
diff --git a/jjb/usecaseui/usecase-ui-intent-analysis.yaml b/jjb/usecaseui/usecase-ui-intent-analysis.yaml
index a016d51..cb5bf82 100644
--- a/jjb/usecaseui/usecase-ui-intent-analysis.yaml
+++ b/jjb/usecaseui/usecase-ui-intent-analysis.yaml
@@ -1,33 +1,34 @@
---
-
- project:
name: usecase-ui-intent-analysis
- project-name: 'usecase-ui-intent-analysis'
- project: 'usecase-ui/intent-analysis'
+ project-name: "usecase-ui-intent-analysis"
+ project: "usecase-ui/intent-analysis"
stream:
- - 'master':
- branch: 'master'
- - 'kohn':
- branch: 'kohn'
- mvn-settings: 'usecase-ui-intent-analysis-settings'
+ - "master":
+ branch: "master"
+ - "kohn":
+ branch: "kohn"
+ mvn-settings: "usecase-ui-intent-analysis-settings"
jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
+ - "{project-name}-{stream}-verify-java"
+ - "{project-name}-{stream}-merge-java"
- gerrit-maven-stage:
+ sbom-generator: true
sign-artifacts: true
- build-node: centos7-builder-4c-4g
+ build-node: centos8-docker-4c-4g
maven-versions-plugin: true
- gerrit-maven-docker-stage:
+ sbom-generator: true
build-node: ubuntu1804-docker-8c-8g
- mvn-params: '-P docker -Dmaven.test.skip=true'
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
+ mvn-params: "-P docker -Dmaven.test.skip=true"
+ container-public-registry: "nexus3.onap.org:10001"
+ container-staging-registry: "nexus3.onap.org:10003"
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
java-version: openjdk11
- files: '**'
- archive-artifacts: ''
- docker-pom: 'pom.xml'
+ files: "**"
+ archive-artifacts: ""
+ docker-pom: "pom.xml"
build-node: ubuntu1804-builder-4c-4g
- project:
@@ -35,32 +36,31 @@
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
build-node: ubuntu1804-builder-4c-4g
- project: 'usecase-ui/intent-analysis'
- project-name: 'usecase-ui-intent-analysis'
- branch: 'master'
- mvn-settings: 'usecase-ui-intent-analysis-settings'
+ project: "usecase-ui/intent-analysis"
+ project-name: "usecase-ui-intent-analysis"
+ branch: "master"
+ mvn-settings: "usecase-ui-intent-analysis-settings"
java-version: openjdk11
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
- project:
name: usecase-ui-intent-analysis-clm
jobs:
- gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
+ nexus-iq-namespace: "onap-"
project: usecase-ui/intent-analysis
- project-name: 'usecase-ui-intent-analysis'
+ project-name: "usecase-ui-intent-analysis"
build-node: ubuntu1804-builder-4c-4g
stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'usecase-ui-intent-analysis-settings'
+ - "master":
+ branch: "master"
+ mvn-settings: "usecase-ui-intent-analysis-settings"
java-version: openjdk11
- project:
@@ -68,6 +68,6 @@
project-name: usecase-ui-intent-analysis
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: usecase-ui/intent-analysis
branch: master
diff --git a/jjb/usecaseui/usecase-ui-nlp.yaml b/jjb/usecaseui/usecase-ui-nlp.yaml
index c60faef..a255cce 100644
--- a/jjb/usecaseui/usecase-ui-nlp.yaml
+++ b/jjb/usecaseui/usecase-ui-nlp.yaml
@@ -1,30 +1,30 @@
---
-
- project:
name: usecase-ui-nlp
- project-name: 'usecase-ui-nlp'
- project: 'usecase-ui/nlp'
+ project-name: "usecase-ui-nlp"
+ project: "usecase-ui/nlp"
stream:
- - 'master':
- branch: 'master'
- - 'kohn':
- branch: 'kohn'
- mvn-settings: 'usecase-ui-nlp-settings'
+ - "master":
+ branch: "master"
+ - "kohn":
+ branch: "kohn"
+ mvn-settings: "usecase-ui-nlp-settings"
jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
+ - "{project-name}-{stream}-verify-java"
+ - "{project-name}-{stream}-merge-java"
- gerrit-maven-stage:
+ sbom-generator: true
sign-artifacts: true
- build-node: centos7-builder-4c-4g
+ build-node: centos8-docker-4c-4g
maven-versions-plugin: true
- - '{project-name}-{stream}-docker-java-daily':
- mvn-params: '-Dmaven.test.skip=true'
+ - "{project-name}-{stream}-docker-java-daily":
+ mvn-params: "-Dmaven.test.skip=true"
build-node: ubuntu1804-docker-8c-8g
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
- files: '**'
- archive-artifacts: ''
- docker-pom: 'pom.xml'
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
+ files: "**"
+ archive-artifacts: ""
+ docker-pom: "pom.xml"
mvn-profile: docker
build-node: ubuntu1804-builder-4c-4g
@@ -33,36 +33,35 @@
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
build-node: ubuntu1804-builder-4c-4g
- project: 'usecase-ui/nlp'
- project-name: 'usecase-ui-nlp'
- branch: 'master'
- mvn-settings: 'usecase-ui-nlp-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ project: "usecase-ui/nlp"
+ project-name: "usecase-ui-nlp"
+ branch: "master"
+ mvn-settings: "usecase-ui-nlp-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
- project:
name: usecase-ui-nlp-clm
jobs:
- gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
+ nexus-iq-namespace: "onap-"
project: usecase-ui/nlp
- project-name: 'usecase-ui-nlp'
+ project-name: "usecase-ui-nlp"
build-node: ubuntu1804-builder-4c-4g
- branch: 'master'
- mvn-settings: 'usecase-ui-nlp-settings'
+ branch: "master"
+ mvn-settings: "usecase-ui-nlp-settings"
- project:
name: usecase-ui-nlp-info
project-name: usecase-ui-nlp
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: usecase-ui/nlp
branch: master
diff --git a/jjb/usecaseui/usecase-ui-server.yaml b/jjb/usecaseui/usecase-ui-server.yaml
index f4d09fa..7115be4 100644
--- a/jjb/usecaseui/usecase-ui-server.yaml
+++ b/jjb/usecaseui/usecase-ui-server.yaml
@@ -1,30 +1,30 @@
---
-
- project:
name: usecase-ui-server
- project-name: 'usecase-ui-server'
- project: 'usecase-ui/server'
+ project-name: "usecase-ui-server"
+ project: "usecase-ui/server"
stream:
- - 'master':
- branch: 'master'
- - 'kohn':
- branch: 'kohn'
- mvn-settings: 'usecase-ui-server-settings'
+ - "master":
+ branch: "master"
+ - "kohn":
+ branch: "kohn"
+ mvn-settings: "usecase-ui-server-settings"
jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
+ - "{project-name}-{stream}-verify-java"
+ - "{project-name}-{stream}-merge-java"
- gerrit-maven-stage:
+ sbom-generator: true
sign-artifacts: true
- build-node: centos7-builder-4c-4g
+ build-node: centos8-docker-4c-4g
maven-versions-plugin: true
- - '{project-name}-{stream}-docker-java-daily':
- mvn-params: '-Dmaven.test.skip=true'
+ - "{project-name}-{stream}-docker-java-daily":
+ mvn-params: "-Dmaven.test.skip=true"
build-node: ubuntu1804-docker-8c-8g
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
- files: '**'
- archive-artifacts: ''
- docker-pom: 'pom.xml'
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
+ files: "**"
+ archive-artifacts: ""
+ docker-pom: "pom.xml"
mvn-profile: docker
build-node: ubuntu1804-builder-4c-4g
@@ -33,35 +33,34 @@
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
build-node: ubuntu1804-builder-4c-4g
- project: 'usecase-ui/server'
- project-name: 'usecase-ui-server'
- branch: 'master'
- mvn-settings: 'usecase-ui-server-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ project: "usecase-ui/server"
+ project-name: "usecase-ui-server"
+ branch: "master"
+ mvn-settings: "usecase-ui-server-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
- project:
name: usecase-ui-server-clm
jobs:
- gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
+ nexus-iq-namespace: "onap-"
project: usecase-ui/server
- project-name: 'usecase-ui-server'
+ project-name: "usecase-ui-server"
build-node: ubuntu1804-builder-4c-4g
- branch: 'master'
- mvn-settings: 'usecase-ui-server-settings'
+ branch: "master"
+ mvn-settings: "usecase-ui-server-settings"
- project:
name: usecase-ui-server-info
project-name: usecase-ui-server
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: usecase-ui/server
branch: master
diff --git a/jjb/usecaseui/usecase-ui.yaml b/jjb/usecaseui/usecase-ui.yaml
index 2c95ecf..a447220 100644
--- a/jjb/usecaseui/usecase-ui.yaml
+++ b/jjb/usecaseui/usecase-ui.yaml
@@ -7,29 +7,30 @@
- project:
name: usecase-ui
- project-name: 'usecase-ui'
- project: 'usecase-ui'
+ project-name: "usecase-ui"
+ project: "usecase-ui"
stream:
- - 'master':
- branch: 'master'
- - 'kohn':
- branch: 'kohn'
- mvn-settings: 'usecase-ui-settings'
+ - "master":
+ branch: "master"
+ - "kohn":
+ branch: "kohn"
+ mvn-settings: "usecase-ui-settings"
jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
+ - "{project-name}-{stream}-verify-java"
+ - "{project-name}-{stream}-merge-java"
- gerrit-maven-stage:
+ sbom-generator: true
sign-artifacts: true
- build-node: centos7-builder-4c-4g
+ build-node: centos8-docker-4c-4g
maven-versions-plugin: true
- - '{project-name}-{stream}-docker-java-daily':
- mvn-params: '-Dmaven.test.skip=true'
+ - "{project-name}-{stream}-docker-java-daily":
+ mvn-params: "-Dmaven.test.skip=true"
build-node: ubuntu1804-docker-8c-8g
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
- files: '**'
- archive-artifacts: ''
- docker-pom: 'pom.xml'
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
+ files: "**"
+ archive-artifacts: ""
+ docker-pom: "pom.xml"
mvn-profile: docker
build-node: ubuntu1804-builder-4c-4g
@@ -37,18 +38,18 @@
name: usecase-ui-clm
jobs:
- gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
+ nexus-iq-namespace: "onap-"
project: usecase-ui
- project-name: 'usecase-ui'
+ project-name: "usecase-ui"
build-node: ubuntu1804-builder-4c-4g
- branch: 'master'
- mvn-settings: 'usecase-ui-settings'
+ branch: "master"
+ mvn-settings: "usecase-ui-settings"
- project:
name: usecase-ui-info
project-name: usecase-ui
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: usecase-ui
branch: master
diff --git a/jjb/vfc/build-gvnfm-driver-docker-image.sh b/jjb/vfc/build-gvnfm-driver-docker-image.sh
index 3d2ff81..7948e7c 100755
--- a/jjb/vfc/build-gvnfm-driver-docker-image.sh
+++ b/jjb/vfc/build-gvnfm-driver-docker-image.sh
@@ -8,7 +8,7 @@
chmod 755 ./gvnfmadapter/docker/*.*
./gvnfmadapter/docker/build_image.sh
-# juju-vnfmadapter is removed
+# juju-vnfmadapter is removed
# chmod 755 ./juju/juju-vnfmadapter/Juju-vnfmadapterService/docker/*.*
# ./juju/juju-vnfmadapter/Juju-vnfmadapterService/docker/build_image.sh
diff --git a/jjb/vfc/vfc-gvnfm-vnflcm-csit.yaml b/jjb/vfc/vfc-gvnfm-vnflcm-csit.yaml
index 674e71a..8f12477 100644
--- a/jjb/vfc/vfc-gvnfm-vnflcm-csit.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnflcm-csit.yaml
@@ -2,13 +2,13 @@
- project:
name: vfc-gvnfm-vnflcm-csit
jobs:
- - '{project-name}-{stream}-verify-csit-{functionality}'
- - '{project-name}-{stream}-csit-{functionality}'
- project-name: 'vfc-gvnfm-vnflcm'
- recipients: 'dengyuanhong@chinamobile.com'
- stream: 'master'
+ - "{project-name}-{stream}-verify-csit-{functionality}"
+ - "{project-name}-{stream}-csit-{functionality}"
+ project-name: "vfc-gvnfm-vnflcm"
+ recipients: "dengyuanhong@chinamobile.com"
+ stream: "master"
functionality:
- - 'sanity-check':
- trigger_jobs: 'vfc-gvnfm-vnflcm-master-docker-java-version-shell-daily'
- robot-options: ''
- branch: 'master'
+ - "sanity-check":
+ trigger_jobs: "vfc-gvnfm-vnflcm-master-docker-java-version-shell-daily"
+ robot-options: ""
+ branch: "master"
diff --git a/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml b/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml
index 589a7ad..961289d 100644
--- a/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml
@@ -7,33 +7,33 @@
- project:
name: vfc-gvnfm-vnflcm-java
- project-name: 'vfc-gvnfm-vnflcm'
- project: 'vfc/gvnfm/vnflcm'
+ project-name: "vfc-gvnfm-vnflcm"
+ project: "vfc/gvnfm/vnflcm"
stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'vfc-gvnfm-vnflcm-settings'
+ - "master":
+ branch: "master"
+ mvn-settings: "vfc-gvnfm-vnflcm-settings"
subproject:
- - 'lcm':
- pom: 'lcm/pom.xml'
- pattern: 'lcm/**'
+ - "lcm":
+ pom: "lcm/pom.xml"
+ pattern: "lcm/**"
jobs:
- - '{project-name}-{stream}-{subproject}-verify-java'
- - '{project-name}-{stream}-{subproject}-merge-java'
+ - "{project-name}-{stream}-{subproject}-verify-java"
+ - "{project-name}-{stream}-{subproject}-merge-java"
- gerrit-maven-stage:
+ sbom-generator: true
sign-artifacts: true
- build-node: centos7-builder-4c-4g
+ build-node: centos8-docker-4c-4g
maven-versions-plugin: true
- - '{project-name}-{stream}-docker-java-version-shell-daily':
- docker-pom: 'pom.xml'
- mvn-goals: 'install'
- script:
- !include-raw-escape: 'build-gvnfm-vnflcm-docker-image.sh'
+ - "{project-name}-{stream}-docker-java-version-shell-daily":
+ docker-pom: "pom.xml"
+ mvn-goals: "install"
+ script: !include-raw-escape: "build-gvnfm-vnflcm-docker-image.sh"
build-node: ubuntu1804-docker-8c-8g
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
- files: '**'
- archive-artifacts: ''
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
+ files: "**"
+ archive-artifacts: ""
build-node: centos8-redis-4c-4g
- project:
@@ -41,36 +41,35 @@
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
- cron: '@daily'
- mvn-params: '-f lcm/pom.xml'
+ cron: "@daily"
+ mvn-params: "-f lcm/pom.xml"
build-node: ubuntu1804-builder-4c-4g
- project: 'vfc/gvnfm/vnflcm'
- project-name: 'vfc-gvnfm-vnflcm-lcm'
- branch: 'master'
- mvn-settings: 'vfc-gvnfm-vnflcm-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ project: "vfc/gvnfm/vnflcm"
+ project-name: "vfc-gvnfm-vnflcm-lcm"
+ branch: "master"
+ mvn-settings: "vfc-gvnfm-vnflcm-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
- project:
name: vfc-gvnfm-vnflcm-java-clm
jobs:
- gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
+ nexus-iq-namespace: "onap-"
project: vfc/gvnfm/vnflcm
- project-name: 'vfc-gvnfm-vnflcm'
+ project-name: "vfc-gvnfm-vnflcm"
build-node: centos8-redis-4c-4g
- branch: 'master'
- mvn-settings: 'vfc-gvnfm-vnflcm-settings'
+ branch: "master"
+ mvn-settings: "vfc-gvnfm-vnflcm-settings"
- project:
name: vfc-gvnfm-vnflcm-info
project-name: vfc-gvnfm-vnflcm
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: vfc/gvnfm/vnflcm
branch: master
diff --git a/jjb/vfc/vfc-gvnfm-vnflcm-python.yaml b/jjb/vfc/vfc-gvnfm-vnflcm-python.yaml
index 797e0a0..d58c648 100644
--- a/jjb/vfc/vfc-gvnfm-vnflcm-python.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnflcm-python.yaml
@@ -1,17 +1,16 @@
---
-
- project:
name: vfc-gvnfm-vnflcm
- project-name: 'vfc-gvnfm-vnflcm'
- project: 'vfc/gvnfm/vnflcm'
+ project-name: "vfc-gvnfm-vnflcm"
+ project: "vfc/gvnfm/vnflcm"
stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'vfc-gvnfm-vnflcm-settings'
+ - "master":
+ branch: "master"
+ mvn-settings: "vfc-gvnfm-vnflcm-settings"
build-node: ubuntu1804-builder-4c-4g
subproject:
- - 'lcm':
- path: 'lcm'
- pattern: 'lcm/**'
+ - "lcm":
+ path: "lcm"
+ pattern: "lcm/**"
jobs:
- - '{project-name}-{stream}-{subproject}-verify-python'
+ - "{project-name}-{stream}-{subproject}-verify-python"
diff --git a/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml b/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml
index 1445f9b..3a892a9 100644
--- a/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml
@@ -1,33 +1,33 @@
---
- project:
name: vfc-gvnfm-vnfmgr-java
- project-name: 'vfc-gvnfm-vnfmgr'
- project: 'vfc/gvnfm/vnfmgr'
+ project-name: "vfc-gvnfm-vnfmgr"
+ project: "vfc/gvnfm/vnfmgr"
stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'vfc-gvnfm-vnfmgr-settings'
+ - "master":
+ branch: "master"
+ mvn-settings: "vfc-gvnfm-vnfmgr-settings"
subproject:
- - 'mgr':
- pom: 'mgr/pom.xml'
- pattern: 'mgr/**'
+ - "mgr":
+ pom: "mgr/pom.xml"
+ pattern: "mgr/**"
jobs:
- - '{project-name}-{stream}-{subproject}-verify-java'
- - '{project-name}-{stream}-{subproject}-merge-java'
+ - "{project-name}-{stream}-{subproject}-verify-java"
+ - "{project-name}-{stream}-{subproject}-merge-java"
- gerrit-maven-stage:
+ sbom-generator: true
sign-artifacts: true
- build-node: centos7-builder-4c-4g
+ build-node: centos8-docker-4c-4g
maven-versions-plugin: true
- - '{project-name}-{stream}-docker-java-version-shell-daily':
- docker-pom: 'pom.xml'
- mvn-goals: 'install'
- script:
- !include-raw-escape: 'build-gvnfm-vnfmgr-docker-image.sh'
+ - "{project-name}-{stream}-docker-java-version-shell-daily":
+ docker-pom: "pom.xml"
+ mvn-goals: "install"
+ script: !include-raw-escape: "build-gvnfm-vnfmgr-docker-image.sh"
build-node: ubuntu1804-docker-8c-8g
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
- files: '**'
- archive-artifacts: ''
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
+ files: "**"
+ archive-artifacts: ""
build-node: ubuntu1804-builder-4c-4g
- project:
@@ -35,36 +35,35 @@
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
- cron: '@daily'
- mvn-params: '-f mgr/pom.xml'
+ cron: "@daily"
+ mvn-params: "-f mgr/pom.xml"
build-node: ubuntu1804-builder-4c-4g
- project: 'vfc/gvnfm/vnfmgr'
- project-name: 'vfc-gvnfm-vnfmgr-mgr'
- branch: 'master'
- mvn-settings: 'vfc-gvnfm-vnfmgr-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ project: "vfc/gvnfm/vnfmgr"
+ project-name: "vfc-gvnfm-vnfmgr-mgr"
+ branch: "master"
+ mvn-settings: "vfc-gvnfm-vnfmgr-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
- project:
name: vfc-gvnfm-vnfmgr-java-clm
jobs:
- gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
+ nexus-iq-namespace: "onap-"
project: vfc/gvnfm/vnfmgr
- project-name: 'vfc-gvnfm-vnfmgr'
+ project-name: "vfc-gvnfm-vnfmgr"
build-node: ubuntu1804-builder-4c-4g
- branch: 'master'
- mvn-settings: 'vfc-gvnfm-vnfmgr-settings'
+ branch: "master"
+ mvn-settings: "vfc-gvnfm-vnfmgr-settings"
- project:
name: vfc-gvnfm-vnfmgr-info
project-name: vfc-gvnfm-vnfmgr
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: vfc/gvnfm/vnfmgr
branch: master
diff --git a/jjb/vfc/vfc-gvnfm-vnfmgr-python.yaml b/jjb/vfc/vfc-gvnfm-vnfmgr-python.yaml
index 2bb891b..7f8f3c7 100644
--- a/jjb/vfc/vfc-gvnfm-vnfmgr-python.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnfmgr-python.yaml
@@ -1,17 +1,16 @@
---
-
- project:
name: vfc-gvnfm-vnfmgr
- project-name: 'vfc-gvnfm-vnfmgr'
- project: 'vfc/gvnfm/vnfmgr'
+ project-name: "vfc-gvnfm-vnfmgr"
+ project: "vfc/gvnfm/vnfmgr"
stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'vfc-gvnfm-vnfmgr-settings'
+ - "master":
+ branch: "master"
+ mvn-settings: "vfc-gvnfm-vnfmgr-settings"
build-node: ubuntu1804-builder-4c-4g
subproject:
- - 'mgr':
- path: 'mgr'
- pattern: 'mgr/**'
+ - "mgr":
+ path: "mgr"
+ pattern: "mgr/**"
jobs:
- - '{project-name}-{stream}-{subproject}-verify-python'
+ - "{project-name}-{stream}-{subproject}-verify-python"
diff --git a/jjb/vfc/vfc-gvnfm-vnfres-csit.yaml b/jjb/vfc/vfc-gvnfm-vnfres-csit.yaml
index cd4b848..57980bf 100644
--- a/jjb/vfc/vfc-gvnfm-vnfres-csit.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnfres-csit.yaml
@@ -2,13 +2,13 @@
- project:
name: vfc-gvnfm-vnfres-csit
jobs:
- - '{project-name}-{stream}-verify-csit-{functionality}'
- - '{project-name}-{stream}-csit-{functionality}'
- project-name: 'vfc-gvnfm-vnfres'
- recipients: 'dengyuanhong@chinamobile.com'
- stream: 'master'
+ - "{project-name}-{stream}-verify-csit-{functionality}"
+ - "{project-name}-{stream}-csit-{functionality}"
+ project-name: "vfc-gvnfm-vnfres"
+ recipients: "dengyuanhong@chinamobile.com"
+ stream: "master"
functionality:
- - 'sanity-check':
- trigger_jobs: 'vfc-gvnfm-vnfres-master-docker-java-version-shell-daily'
- robot-options: ''
- branch: 'master'
+ - "sanity-check":
+ trigger_jobs: "vfc-gvnfm-vnfres-master-docker-java-version-shell-daily"
+ robot-options: ""
+ branch: "master"
diff --git a/jjb/vfc/vfc-gvnfm-vnfres-java.yaml b/jjb/vfc/vfc-gvnfm-vnfres-java.yaml
index 6551d45..4c59457 100644
--- a/jjb/vfc/vfc-gvnfm-vnfres-java.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnfres-java.yaml
@@ -1,34 +1,33 @@
---
-
- project:
name: vfc-gvnfm-vnfres-java
- project-name: 'vfc-gvnfm-vnfres'
- project: 'vfc/gvnfm/vnfres'
+ project-name: "vfc-gvnfm-vnfres"
+ project: "vfc/gvnfm/vnfres"
stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'vfc-gvnfm-vnfres-settings'
+ - "master":
+ branch: "master"
+ mvn-settings: "vfc-gvnfm-vnfres-settings"
subproject:
- - 'res':
- pom: 'res/pom.xml'
- pattern: 'res/**'
+ - "res":
+ pom: "res/pom.xml"
+ pattern: "res/**"
jobs:
- - '{project-name}-{stream}-{subproject}-verify-java'
- - '{project-name}-{stream}-{subproject}-merge-java'
+ - "{project-name}-{stream}-{subproject}-verify-java"
+ - "{project-name}-{stream}-{subproject}-merge-java"
- gerrit-maven-stage:
+ sbom-generator: true
sign-artifacts: true
- build-node: centos7-builder-4c-4g
+ build-node: centos8-docker-4c-4g
maven-versions-plugin: true
- - '{project-name}-{stream}-docker-java-version-shell-daily':
- docker-pom: 'pom.xml'
- mvn-goals: 'install'
- script:
- !include-raw-escape: 'build-gvnfm-vnfres-docker-image.sh'
+ - "{project-name}-{stream}-docker-java-version-shell-daily":
+ docker-pom: "pom.xml"
+ mvn-goals: "install"
+ script: !include-raw-escape: "build-gvnfm-vnfres-docker-image.sh"
build-node: ubuntu1804-docker-8c-8g
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
- files: '**'
- archive-artifacts: ''
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
+ files: "**"
+ archive-artifacts: ""
build-node: ubuntu1804-builder-4c-4g
- project:
@@ -36,36 +35,35 @@
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
- cron: '@daily'
- mvn-params: '-f res/pom.xml'
+ cron: "@daily"
+ mvn-params: "-f res/pom.xml"
build-node: ubuntu1804-builder-4c-4g
- project: 'vfc/gvnfm/vnfres'
- project-name: 'vfc-gvnfm-vnfres-res'
- branch: 'master'
- mvn-settings: 'vfc-gvnfm-vnfres-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ project: "vfc/gvnfm/vnfres"
+ project-name: "vfc-gvnfm-vnfres-res"
+ branch: "master"
+ mvn-settings: "vfc-gvnfm-vnfres-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
- project:
name: vfc-gvnfm-vnfres-java-clm
jobs:
- gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
+ nexus-iq-namespace: "onap-"
project: vfc/gvnfm/vnfres
- project-name: 'vfc-gvnfm-vnfres'
+ project-name: "vfc-gvnfm-vnfres"
build-node: ubuntu1804-builder-4c-4g
- branch: 'master'
- mvn-settings: 'vfc-gvnfm-vnfres-settings'
+ branch: "master"
+ mvn-settings: "vfc-gvnfm-vnfres-settings"
- project:
name: vfc-gvnfm-vnfres-info
project-name: vfc-gvnfm-vnfres
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: vfc/gvnfm/vnfres
branch: master
diff --git a/jjb/vfc/vfc-gvnfm-vnfres-python.yaml b/jjb/vfc/vfc-gvnfm-vnfres-python.yaml
index 5bdf8e4..9040de9 100644
--- a/jjb/vfc/vfc-gvnfm-vnfres-python.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnfres-python.yaml
@@ -1,17 +1,16 @@
---
-
- project:
name: vfc-gvnfm-vnfres
- project-name: 'vfc-gvnfm-vnfres'
- project: 'vfc/gvnfm/vnfres'
+ project-name: "vfc-gvnfm-vnfres"
+ project: "vfc/gvnfm/vnfres"
stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'vfc-gvnfm-vnfres-settings'
+ - "master":
+ branch: "master"
+ mvn-settings: "vfc-gvnfm-vnfres-settings"
build-node: ubuntu1804-builder-4c-4g
subproject:
- - 'res':
- path: 'res'
- pattern: 'res/**'
+ - "res":
+ path: "res"
+ pattern: "res/**"
jobs:
- - '{project-name}-{stream}-{subproject}-verify-python'
+ - "{project-name}-{stream}-{subproject}-verify-python"
diff --git a/jjb/vfc/vfc-nfvo-db.yaml b/jjb/vfc/vfc-nfvo-db.yaml
index 679cc45..d06c90d 100644
--- a/jjb/vfc/vfc-nfvo-db.yaml
+++ b/jjb/vfc/vfc-nfvo-db.yaml
@@ -1,35 +1,34 @@
---
- project:
name: vfc-nfvo-db
- project: 'vfc/nfvo/db'
- project-name: 'vfc-nfvo-db'
- mvn-settings: 'vfc-nfvo-db-settings'
+ project: "vfc/nfvo/db"
+ project-name: "vfc-nfvo-db"
+ mvn-settings: "vfc-nfvo-db-settings"
stream:
- - 'master':
- branch: 'master'
+ - "master":
+ branch: "master"
build-node: ubuntu1804-builder-4c-4g
jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
+ - "{project-name}-{stream}-verify-java"
+ - "{project-name}-{stream}-merge-java"
- gerrit-maven-stage:
+ sbom-generator: true
sign-artifacts: true
- build-node: centos7-builder-4c-4g
+ build-node: centos8-docker-4c-4g
maven-versions-plugin: true
- - '{project-name}-{stream}-docker-java-version-shell-daily':
- docker-pom: 'pom.xml'
- mvn-goals: 'install'
- script:
- !include-raw-escape: 'build-nfvo-db-docker-image.sh'
+ - "{project-name}-{stream}-docker-java-version-shell-daily":
+ docker-pom: "pom.xml"
+ mvn-goals: "install"
+ script: !include-raw-escape: "build-nfvo-db-docker-image.sh"
build-node: ubuntu1804-docker-8c-8g
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
-
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
- project:
name: vfc-nfvo-db-info
project-name: vfc-nfvo-db
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: vfc/nfvo/db
branch: master
diff --git a/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml b/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml
index 1db7b67..259ab14 100644
--- a/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml
@@ -1,30 +1,31 @@
---
- project:
name: vfc-nfvo-driver-svnfm-huawei
- project-name: 'vfc-nfvo-driver-svnfm-huawei'
+ project-name: "vfc-nfvo-driver-svnfm-huawei"
java-version: openjdk11
- project: 'vfc/nfvo/driver/vnfm/svnfm'
+ project: "vfc/nfvo/driver/vnfm/svnfm"
stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings'
+ - "master":
+ branch: "master"
+ mvn-settings: "vfc-nfvo-driver-vnfm-svnfm-settings"
subproject:
- - 'drv-vnfm-huawei':
- pom: 'huawei/pom.xml'
- pattern: 'huawei/**'
+ - "drv-vnfm-huawei":
+ pom: "huawei/pom.xml"
+ pattern: "huawei/**"
jobs:
- - '{project-name}-{stream}-{subproject}-verify-java'
- - '{project-name}-{stream}-{subproject}-merge-java'
+ - "{project-name}-{stream}-{subproject}-verify-java"
+ - "{project-name}-{stream}-{subproject}-merge-java"
- gerrit-maven-stage:
+ sbom-generator: true
sign-artifacts: true
- build-node: centos7-builder-4c-4g
+ build-node: centos8-docker-4c-4g
maven-versions-plugin: true
- mvn-pom: 'huawei/pom.xml'
- mvn-params: '-f huawei/pom.xml'
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
- files: '**'
- archive-artifacts: ''
+ mvn-pom: "huawei/pom.xml"
+ mvn-params: "-f huawei/pom.xml"
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
+ files: "**"
+ archive-artifacts: ""
build-node: ubuntu1804-builder-4c-4g
- project:
@@ -33,32 +34,31 @@
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
- cron: '@daily'
+ cron: "@daily"
build-node: ubuntu1804-builder-4c-4g
- mvn-params: '-f huawei/pom.xml'
- project: 'vfc/nfvo/driver/vnfm/svnfm'
- project-name: 'vfc-nfvo-driver-svnfm-huawei'
- branch: 'master'
- mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ mvn-params: "-f huawei/pom.xml"
+ project: "vfc/nfvo/driver/vnfm/svnfm"
+ project-name: "vfc-nfvo-driver-svnfm-huawei"
+ branch: "master"
+ mvn-settings: "vfc-nfvo-driver-vnfm-svnfm-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
- project:
name: vfc-nfvo-driver-svnfm-huawei-clm
java-version: openjdk11
jobs:
- gerrit-maven-clm:
- mvn-params: '-f huawei/pom.xml'
- nexus-iq-namespace: 'onap-'
+ mvn-params: "-f huawei/pom.xml"
+ nexus-iq-namespace: "onap-"
project: vfc/nfvo/driver/vnfm/svnfm
- project-name: 'vfc-nfvo-driver-svnfm-huawei'
+ project-name: "vfc-nfvo-driver-svnfm-huawei"
build-node: ubuntu1804-builder-4c-4g
- branch: 'master'
- mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings'
+ branch: "master"
+ mvn-settings: "vfc-nfvo-driver-vnfm-svnfm-settings"
- project:
name: vfc-nfvo-driver-svnfm-huawei-info
@@ -66,6 +66,6 @@
java-version: openjdk11
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: vfc/nfvo/driver/vnfm/svnfm
branch: master
diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-csit.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-csit.yaml
index 52515da..40ed276 100644
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-csit.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-csit.yaml
@@ -2,13 +2,13 @@
- project:
name: vfc-nfvo-driver-vnfm-gvnfm-csit
jobs:
- - '{project-name}-{stream}-verify-csit-{functionality}'
- - '{project-name}-{stream}-csit-{functionality}'
- project-name: 'vfc-nfvo-driver-vnfm-gvnfm'
- recipients: 'dengyuanhong@chinamobile.com'
- stream: 'master'
+ - "{project-name}-{stream}-verify-csit-{functionality}"
+ - "{project-name}-{stream}-csit-{functionality}"
+ project-name: "vfc-nfvo-driver-vnfm-gvnfm"
+ recipients: "dengyuanhong@chinamobile.com"
+ stream: "master"
functionality:
- - 'sanity-check':
- trigger_jobs: 'vfc-nfvo-driver-vnfm-gvnfm-master-docker-java-version-shell-daily'
- robot-options: ''
- branch: 'master'
+ - "sanity-check":
+ trigger_jobs: "vfc-nfvo-driver-vnfm-gvnfm-master-docker-java-version-shell-daily"
+ robot-options: ""
+ branch: "master"
diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml
index db89aff..4c9dba9 100644
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml
@@ -1,36 +1,35 @@
---
-
- project:
name: vfc-nfvo-driver-vnfm-gvnfm-java
- project-name: 'vfc-nfvo-driver-vnfm-gvnfm'
- project: 'vfc/nfvo/driver/vnfm/gvnfm'
+ project-name: "vfc-nfvo-driver-vnfm-gvnfm"
+ project: "vfc/nfvo/driver/vnfm/gvnfm"
stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'vfc-nfvo-driver-vnfm-gvnfm-settings'
+ - "master":
+ branch: "master"
+ mvn-settings: "vfc-nfvo-driver-vnfm-gvnfm-settings"
subproject:
- - 'gvnfmadapter':
- pom: 'gvnfmadapter/pom.xml'
- pattern: 'gvnfmadapter/**'
+ - "gvnfmadapter":
+ pom: "gvnfmadapter/pom.xml"
+ pattern: "gvnfmadapter/**"
jobs:
- - '{project-name}-{stream}-{subproject}-verify-java'
- - '{project-name}-{stream}-{subproject}-merge-java'
+ - "{project-name}-{stream}-{subproject}-verify-java"
+ - "{project-name}-{stream}-{subproject}-merge-java"
- gerrit-maven-stage:
+ sbom-generator: true
sign-artifacts: true
- build-node: centos7-builder-4c-4g
+ build-node: centos8-docker-4c-4g
maven-versions-plugin: true
- mvn-pom: 'gvnfmadapter/pom.xml'
- mvn-params: '-f gvnfmadapter/pom.xml'
- - '{project-name}-{stream}-docker-java-version-shell-daily':
- docker-pom: 'pom.xml'
- mvn-goals: 'install'
- script:
- !include-raw-escape: 'build-gvnfm-driver-docker-image.sh'
+ mvn-pom: "gvnfmadapter/pom.xml"
+ mvn-params: "-f gvnfmadapter/pom.xml"
+ - "{project-name}-{stream}-docker-java-version-shell-daily":
+ docker-pom: "pom.xml"
+ mvn-goals: "install"
+ script: !include-raw-escape: "build-gvnfm-driver-docker-image.sh"
build-node: ubuntu1804-docker-8c-8g
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
- files: '**'
- archive-artifacts: ''
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
+ files: "**"
+ archive-artifacts: ""
build-node: ubuntu1804-builder-4c-4g
- project:
@@ -38,36 +37,35 @@
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
- cron: '@daily'
- mvn-params: '-f gvnfmadapter/pom.xml'
+ cron: "@daily"
+ mvn-params: "-f gvnfmadapter/pom.xml"
build-node: ubuntu1804-builder-4c-4g
- project: 'vfc/nfvo/driver/vnfm/gvnfm'
- project-name: 'vfc-nfvo-driver-vnfm-gvnfm-gvnfmadapter'
- branch: 'master'
- mvn-settings: 'vfc-nfvo-driver-vnfm-gvnfm-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ project: "vfc/nfvo/driver/vnfm/gvnfm"
+ project-name: "vfc-nfvo-driver-vnfm-gvnfm-gvnfmadapter"
+ branch: "master"
+ mvn-settings: "vfc-nfvo-driver-vnfm-gvnfm-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
- project:
name: vfc-nfvo-driver-vnfm-gvnfm-java-clm
jobs:
- gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
+ nexus-iq-namespace: "onap-"
project: vfc/nfvo/driver/vnfm/gvnfm
- project-name: 'vfc-nfvo-driver-vnfm-gvnfm'
+ project-name: "vfc-nfvo-driver-vnfm-gvnfm"
build-node: ubuntu1804-builder-4c-4g
- branch: 'master'
- mvn-settings: 'vfc-nfvo-driver-vnfm-gvnfm-settings'
+ branch: "master"
+ mvn-settings: "vfc-nfvo-driver-vnfm-gvnfm-settings"
- project:
name: vfc-nfvo-driver-vnfm-gvnfm-info
project-name: vfc-nfvo-driver-vnfm-gvnfm
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: vfc/nfvo/driver/vnfm/gvnfm
branch: master
diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-python.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-python.yaml
index 0cad04b..c07095b 100644
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-python.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-python.yaml
@@ -1,17 +1,16 @@
---
-
- project:
name: vfc-nfvo-driver-vnfm-gvnfm-python
- project-name: 'vfc-nfvo-driver-vnfm-gvnfm'
- project: 'vfc/nfvo/driver/vnfm/gvnfm'
+ project-name: "vfc-nfvo-driver-vnfm-gvnfm"
+ project: "vfc/nfvo/driver/vnfm/gvnfm"
stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'vfc-nfvo-driver-vnfm-gvnfm-settings'
+ - "master":
+ branch: "master"
+ mvn-settings: "vfc-nfvo-driver-vnfm-gvnfm-settings"
build-node: ubuntu1804-builder-4c-4g
subproject:
- - 'gvnfmadapter':
- path: 'gvnfmadapter'
- pattern: 'gvnfmadapter/**'
+ - "gvnfmadapter":
+ path: "gvnfmadapter"
+ pattern: "gvnfmadapter/**"
jobs:
- - '{project-name}-{stream}-{subproject}-verify-python'
+ - "{project-name}-{stream}-{subproject}-verify-python"
diff --git a/jjb/vfc/vfc-nfvo-lcm-csit.yaml b/jjb/vfc/vfc-nfvo-lcm-csit.yaml
index 1a03d5d..1decb66 100644
--- a/jjb/vfc/vfc-nfvo-lcm-csit.yaml
+++ b/jjb/vfc/vfc-nfvo-lcm-csit.yaml
@@ -2,13 +2,13 @@
- project:
name: vfc-nfvo-lcm-csit
jobs:
- - '{project-name}-{stream}-verify-csit-{functionality}'
- - '{project-name}-{stream}-csit-{functionality}'
- project-name: 'vfc-nfvo-lcm'
- recipients: 'dengyuanhong@chinamobile.com'
- stream: 'master'
+ - "{project-name}-{stream}-verify-csit-{functionality}"
+ - "{project-name}-{stream}-csit-{functionality}"
+ project-name: "vfc-nfvo-lcm"
+ recipients: "dengyuanhong@chinamobile.com"
+ stream: "master"
functionality:
- - 'sanity-check':
- trigger_jobs: 'vfc-nfvo-lcm-master-docker-java-version-shell-daily'
- robot-options: ''
- branch: 'master'
+ - "sanity-check":
+ trigger_jobs: "vfc-nfvo-lcm-master-docker-java-version-shell-daily"
+ robot-options: ""
+ branch: "master"
diff --git a/jjb/vfc/vfc-nfvo-lcm-java.yaml b/jjb/vfc/vfc-nfvo-lcm-java.yaml
index 89726b4..fb2a053 100644
--- a/jjb/vfc/vfc-nfvo-lcm-java.yaml
+++ b/jjb/vfc/vfc-nfvo-lcm-java.yaml
@@ -1,29 +1,29 @@
---
- project:
name: vfc-nfvo-lcm-java
- project-name: 'vfc-nfvo-lcm'
- project: 'vfc/nfvo/lcm'
+ project-name: "vfc-nfvo-lcm"
+ project: "vfc/nfvo/lcm"
stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'vfc-nfvo-lcm-settings'
+ - "master":
+ branch: "master"
+ mvn-settings: "vfc-nfvo-lcm-settings"
jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
+ - "{project-name}-{stream}-verify-java"
+ - "{project-name}-{stream}-merge-java"
- gerrit-maven-stage:
+ sbom-generator: true
sign-artifacts: true
- build-node: centos7-builder-4c-4g
+ build-node: centos8-docker-4c-4g
maven-versions-plugin: true
- - '{project-name}-{stream}-docker-java-version-shell-daily':
- docker-pom: 'pom.xml'
- mvn-goals: 'install'
- script:
- !include-raw-escape: 'build-nfvo-lcm-docker-image.sh'
+ - "{project-name}-{stream}-docker-java-version-shell-daily":
+ docker-pom: "pom.xml"
+ mvn-goals: "install"
+ script: !include-raw-escape: "build-nfvo-lcm-docker-image.sh"
build-node: ubuntu1804-docker-8c-8g
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
- files: '**'
- archive-artifacts: ''
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
+ files: "**"
+ archive-artifacts: ""
build-node: centos8-redis-4c-4g
- project:
@@ -31,35 +31,34 @@
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
- cron: '@daily'
+ cron: "@daily"
build-node: ubuntu1804-builder-4c-4g
- project: 'vfc/nfvo/lcm'
- project-name: 'vfc-nfvo-lcm'
- branch: 'master'
- mvn-settings: 'vfc-nfvo-lcm-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ project: "vfc/nfvo/lcm"
+ project-name: "vfc-nfvo-lcm"
+ branch: "master"
+ mvn-settings: "vfc-nfvo-lcm-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
- project:
name: vfc-nfvo-lcm-java-clm
jobs:
- gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
+ nexus-iq-namespace: "onap-"
project: vfc/nfvo/lcm
- project-name: 'vfc-nfvo-lcm'
+ project-name: "vfc-nfvo-lcm"
build-node: centos8-redis-4c-4g
- branch: 'master'
- mvn-settings: 'vfc-nfvo-lcm-settings'
+ branch: "master"
+ mvn-settings: "vfc-nfvo-lcm-settings"
- project:
name: vfc-nfvo-lcm-info
project-name: vfc-nfvo-lcm
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: vfc/nfvo/lcm
branch: master
diff --git a/jjb/vfc/vfc-nfvo-lcm-python.yaml b/jjb/vfc/vfc-nfvo-lcm-python.yaml
index 19791ef..7c55944 100644
--- a/jjb/vfc/vfc-nfvo-lcm-python.yaml
+++ b/jjb/vfc/vfc-nfvo-lcm-python.yaml
@@ -1,16 +1,16 @@
---
- project:
name: vfc-nfvo-lcm
- project-name: 'vfc-nfvo-lcm'
- project: 'vfc/nfvo/lcm'
+ project-name: "vfc-nfvo-lcm"
+ project: "vfc/nfvo/lcm"
stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'vfc-nfvo-lcm-settings'
+ - "master":
+ branch: "master"
+ mvn-settings: "vfc-nfvo-lcm-settings"
build-node: ubuntu1804-builder-4c-4g
subproject:
- - 'lcm':
- path: '.'
- pattern: '**'
+ - "lcm":
+ path: "."
+ pattern: "**"
jobs:
- - '{project-name}-{stream}-{subproject}-verify-python'
+ - "{project-name}-{stream}-{subproject}-verify-python"
diff --git a/jjb/vnfrqts/build-and-upload.yaml b/jjb/vnfrqts/build-and-upload.yaml
index 0df13c5..103c472 100644
--- a/jjb/vnfrqts/build-and-upload.yaml
+++ b/jjb/vnfrqts/build-and-upload.yaml
@@ -4,12 +4,12 @@
# upload it to nexus as RAW artifacts.
#
- name: '{project-name}-{stream}-build-and-upload'
+ name: "{project-name}-{stream}-build-and-upload"
- pre_script: ''
- post_script: ''
- artifact_name: ''
- project_id: ''
+ pre_script: ""
+ post_script: ""
+ artifact_name: ""
+ project_id: ""
project-type: freestyle
concurrent: true
@@ -17,52 +17,52 @@
properties:
- infra-properties:
- build-days-to-keep: '{build-days-to-keep}'
+ build-days-to-keep: "{build-days-to-keep}"
parameters:
- infra-parameters:
- project: '{project}'
- branch: '{branch}'
- refspec: 'refs/heads/{branch}'
- artifacts: '{archive-artifacts}'
+ 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'
+ credentials-id: "{jenkins-ssh-credential}"
+ url: "$GIT_BASE"
+ refspec: ""
+ choosing-strategy: "default"
branches:
- - 'refs/heads/{branch}'
+ - "refs/heads/{branch}"
skip-tag: true
wipe-workspace: true
submodule:
- recursive: '{submodule-recursive}'
- timeout: '24'
+ recursive: "{submodule-recursive}"
+ timeout: "24"
wrappers:
- infra-wrappers:
- build-timeout: '{build-timeout}'
+ build-timeout: "{build-timeout}"
triggers:
- - timed: 'H H * * *'
+ - timed: "H H * * *"
- gerrit-trigger-release-manually:
- server: '{server-name}'
- project: '{project}'
- branch: '{branch}'
+ server: "{server-name}"
+ project: "{project}"
+ branch: "{branch}"
builders:
- lf-provide-maven-settings:
- global-settings-file: '{mvn-global-settings}'
- settings-file: '{mvn-settings}'
- - shell: '{obj:pre_script}'
+ global-settings-file: "{mvn-global-settings}"
+ settings-file: "{mvn-settings}"
+ - shell: "{obj:pre_script}"
- lf-infra-create-netrc:
server-id: ecomp-raw
- inject:
properties-content: |
ARTIFACT_NAME={artifact_name}
PROJECT_ID={project_id}
- - shell: '{obj:post_script}'
+ - shell: "{obj:post_script}"
- lf-provide-maven-settings-cleanup
publishers:
diff --git a/jjb/vnfrqts/vnfrqts-epics.yaml b/jjb/vnfrqts/vnfrqts-epics.yaml
index f38f4d8..8859c16 100644
--- a/jjb/vnfrqts/vnfrqts-epics.yaml
+++ b/jjb/vnfrqts/vnfrqts-epics.yaml
@@ -7,10 +7,10 @@
- project:
name: vnfrqts-epics
- project: 'vnfrqts/epics'
+ project: "vnfrqts/epics"
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
- project-name: 'vnfrqts-epics'
- branch: 'master'
- mvn-settings: 'vnfrqts-epics-settings'
+ build-node: centos8-builder-2c-1g
+ project-name: "vnfrqts-epics"
+ branch: "master"
+ mvn-settings: "vnfrqts-epics-settings"
diff --git a/jjb/vnfrqts/vnfrqts-guidelines.yaml b/jjb/vnfrqts/vnfrqts-guidelines.yaml
index dbd30a7..2615f4f 100644
--- a/jjb/vnfrqts/vnfrqts-guidelines.yaml
+++ b/jjb/vnfrqts/vnfrqts-guidelines.yaml
@@ -1,10 +1,10 @@
---
- project:
name: vnfrqts-guidelines
- project: 'vnfrqts/guidelines'
+ project: "vnfrqts/guidelines"
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
- project-name: 'vnfrqts-guidelines'
- branch: 'master'
- mvn-settings: 'vnfrqts-guidelines-settings'
+ build-node: centos8-builder-2c-1g
+ project-name: "vnfrqts-guidelines"
+ branch: "master"
+ mvn-settings: "vnfrqts-guidelines-settings"
diff --git a/jjb/vnfrqts/vnfrqts-requirements.yaml b/jjb/vnfrqts/vnfrqts-requirements.yaml
index e026fb4..ce4720f 100644
--- a/jjb/vnfrqts/vnfrqts-requirements.yaml
+++ b/jjb/vnfrqts/vnfrqts-requirements.yaml
@@ -1,25 +1,25 @@
---
- project:
name: vnfrqts-requirements
- project: 'vnfrqts/requirements'
+ project: "vnfrqts/requirements"
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
- project-name: 'vnfrqts-requirements'
- branch: 'master'
- mvn-settings: 'vnfrqts-requirements-settings'
+ build-node: centos8-builder-2c-1g
+ project-name: "vnfrqts-requirements"
+ branch: "master"
+ mvn-settings: "vnfrqts-requirements-settings"
- project:
name: vnfrqts-requirements-upload-json
- project: 'vnfrqts/requirements'
- project-name: 'vnfrqts-requirements'
- mvn-settings: 'vnfrqts-requirements-settings'
- mvn-global-settings: 'global-settings'
+ project: "vnfrqts/requirements"
+ project-name: "vnfrqts-requirements"
+ mvn-settings: "vnfrqts-requirements-settings"
+ mvn-global-settings: "global-settings"
stream:
- - 'master':
- branch: 'master'
+ - "master":
+ branch: "master"
jobs:
- - '{project-name}-{stream}-build-and-upload':
+ - "{project-name}-{stream}-build-and-upload":
pre_script: !include-raw-escape: pre-build-needs.sh
artifact_name: needs.json
project_id: org.onap.vnfrqts.requirements
diff --git a/jjb/vnfrqts/vnfrqts-testcases.yaml b/jjb/vnfrqts/vnfrqts-testcases.yaml
index a06e7ed..d094a86 100644
--- a/jjb/vnfrqts/vnfrqts-testcases.yaml
+++ b/jjb/vnfrqts/vnfrqts-testcases.yaml
@@ -1,10 +1,10 @@
---
- project:
name: vnfrqts-testcases
- project: 'vnfrqts/testcases'
+ project: "vnfrqts/testcases"
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
- project-name: 'vnfrqts-testcases'
- branch: 'master'
- mvn-settings: 'vnfrqts-testcases-settings'
+ build-node: centos8-builder-2c-1g
+ project-name: "vnfrqts-testcases"
+ branch: "master"
+ mvn-settings: "vnfrqts-testcases-settings"
diff --git a/jjb/vnfrqts/vnfrqts-usecases.yaml b/jjb/vnfrqts/vnfrqts-usecases.yaml
index 5070867..61c8be7 100644
--- a/jjb/vnfrqts/vnfrqts-usecases.yaml
+++ b/jjb/vnfrqts/vnfrqts-usecases.yaml
@@ -1,10 +1,10 @@
---
- project:
name: vnfrqts-usecases
- project: 'vnfrqts/usecases'
+ project: "vnfrqts/usecases"
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
- project-name: 'vnfrqts-usecases'
- branch: 'master'
- mvn-settings: 'vnfrqts-usecases-settings'
+ build-node: centos8-builder-2c-1g
+ project-name: "vnfrqts-usecases"
+ branch: "master"
+ mvn-settings: "vnfrqts-usecases-settings"
diff --git a/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml b/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml
index abeee9a..190f23e 100644
--- a/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml
+++ b/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml
@@ -7,81 +7,62 @@
- project:
name: vnfsdk-dovetail-integration
- project-name: 'vnfsdk-dovetail-integration'
+ project-name: "vnfsdk-dovetail-integration"
subproject:
- dovetail-integration:
- path: '.'
- pattern: '**'
- project: 'vnfsdk/dovetail-integration'
- pom: 'pom.xml'
+ path: "."
+ pattern: "**"
+ project: "vnfsdk/dovetail-integration"
+ pom: "pom.xml"
python-version: python2.7
- tox-dir: '.'
- tox-envs: ''
+ tox-dir: "."
+ tox-envs: ""
stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'vnfsdk-dovetail-integration-settings'
+ - "master":
+ branch: "master"
+ mvn-settings: "vnfsdk-dovetail-integration-settings"
build-node: ubuntu1804-builder-4c-4g
jobs:
- - '{project-name}-{stream}-{subproject}-verify-python'
- - '{project-name}-{stream}-{subproject}-merge-java'
- - '{project-name}-{subproject}-python-staging-{stream}'
- - '{project-name}-{subproject}-python-release-{stream}'
- - '{project-name}-{stream}-docker-java-daily':
- docker-pom: 'pom.xml'
- mvn-profile: 'docker'
- mvn-params: '-Dmaven.test.skip=true'
+ - "{project-name}-{stream}-{subproject}-verify-python"
+ - "{project-name}-{stream}-{subproject}-merge-java"
+ - "{project-name}-{subproject}-python-staging-{stream}"
+ - "{project-name}-{subproject}-python-release-{stream}"
+ - "{project-name}-{stream}-docker-java-daily":
+ docker-pom: "pom.xml"
+ mvn-profile: "docker"
+ mvn-params: "-Dmaven.test.skip=true"
build-node: ubuntu1804-docker-8c-8g
-#- project:
-# name: vnfsdk-dovetail-integration-arm64
-# project-name: 'vnfsdk-dovetail-integration-arm64'
-# project: 'vnfsdk/dovetail-integration'
-# pom: 'pom.xml'
-# python-version: python2.7
-# tox-dir: '.'
-# tox-envs: ''
-# stream:
-# - 'master':
-# branch: 'master'
-# mvn-settings: 'vnfsdk-dovetail-integration-settings'
-# build-node: ubuntu1804-docker-arm64-4c-2g
-# jobs:
-# - '{project-name}-{stream}-docker-java-daily':
-# docker-pom: 'pom.xml'
-# mvn-profile: 'docker'
-# mvn-params: '-Dmaven.test.skip=true'
-#
- project:
name: vnfsdk-dovetail-integration-tox-sonar
jobs:
- gerrit-tox-sonar
- cron: '@daily'
+ cron: "@daily"
build-node: ubuntu1804-builder-4c-4g
- project: 'vnfsdk/dovetail-integration'
- project-name: 'vnfsdk-dovetail-integration'
- branch: 'master'
- mvn-settings: 'vnfsdk-dovetail-integration-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ project: "vnfsdk/dovetail-integration"
+ project-name: "vnfsdk-dovetail-integration"
+ branch: "master"
+ mvn-settings: "vnfsdk-dovetail-integration-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
- project:
name: vnfsdk-dovetail-integration-info
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
- project: 'vnfsdk/dovetail-integration'
- project-name: 'vnfsdk-dovetail-integration'
- branch: 'master'
+ build-node: centos8-builder-2c-1g
+ project: "vnfsdk/dovetail-integration"
+ project-name: "vnfsdk-dovetail-integration"
+ branch: "master"
- project:
name: vnfsdk-dovetail-integration-clm
jobs:
- gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
+ nexus-iq-namespace: "onap-"
project: vnfsdk/dovetail-integration
- project-name: 'vnfsdk-dovetail-integration'
+ project-name: "vnfsdk-dovetail-integration"
build-node: ubuntu1804-builder-4c-4g
stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'vnfsdk-dovetail-integration-settings'
+ - "master":
+ branch: "master"
+ mvn-settings: "vnfsdk-dovetail-integration-settings"
diff --git a/jjb/vnfsdk/vnfsdk-functest.yaml b/jjb/vnfsdk/vnfsdk-functest.yaml
index 2e2cfad..327650a 100644
--- a/jjb/vnfsdk/vnfsdk-functest.yaml
+++ b/jjb/vnfsdk/vnfsdk-functest.yaml
@@ -1,42 +1,43 @@
---
- project:
name: vnfsdk-functest
- project-name: 'vnfsdk-functest'
+ project-name: "vnfsdk-functest"
jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
- - gerrit-maven-stage:
- sign-artifacts: true
- build-node: centos7-builder-4c-4g
- maven-versions-plugin: true
+ - "{project-name}-{stream}-verify-java"
+ - "{project-name}-{stream}-merge-java"
+ - gerrit-maven-stage:
+ sbom-generator: true
+ sign-artifacts: true
+ build-node: centos8-docker-4c-4g
+ maven-versions-plugin: true
- project: 'vnfsdk/functest'
+ project: "vnfsdk/functest"
stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'vnfsdk-functest-settings'
- files: '**'
- archive-artifacts: ''
+ - "master":
+ branch: "master"
+ mvn-settings: "vnfsdk-functest-settings"
+ files: "**"
+ archive-artifacts: ""
build-node: ubuntu1804-builder-4c-4g
- project:
name: vnfsdk-functest-info
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
- project: 'vnfsdk/functest'
- project-name: 'vnfsdk-functest'
- branch: 'master'
+ build-node: centos8-builder-2c-1g
+ project: "vnfsdk/functest"
+ project-name: "vnfsdk-functest"
+ branch: "master"
- project:
name: vnfsdk-functest-clm
jobs:
- gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
+ nexus-iq-namespace: "onap-"
project: vnfsdk/functest
- project-name: 'vnfsdk-functest'
+ project-name: "vnfsdk-functest"
build-node: ubuntu1804-builder-4c-4g
stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'vnfsdk-functest-settings'
+ - "master":
+ branch: "master"
+ mvn-settings: "vnfsdk-functest-settings"
diff --git a/jjb/vnfsdk/vnfsdk-lctest.yaml b/jjb/vnfsdk/vnfsdk-lctest.yaml
index e2e365c..266804e 100644
--- a/jjb/vnfsdk/vnfsdk-lctest.yaml
+++ b/jjb/vnfsdk/vnfsdk-lctest.yaml
@@ -1,21 +1,21 @@
---
- project:
name: vnfsdk-lctest
- project: 'vnfsdk/lctest'
+ project: "vnfsdk/lctest"
jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
- project-name: 'vnfsdk-lctest'
+ - "{project-name}-{stream}-verify-java"
+ - "{project-name}-{stream}-merge-java"
+ project-name: "vnfsdk-lctest"
stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'vnfsdk-lctest-settings'
+ - "master":
+ branch: "master"
+ mvn-settings: "vnfsdk-lctest-settings"
- project:
name: vnfsdk-lctest-info
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
- project: 'vnfsdk/lctest'
- project-name: 'vnfsdk-lctest'
- branch: 'master'
+ build-node: centos8-builder-2c-1g
+ project: "vnfsdk/lctest"
+ project-name: "vnfsdk-lctest"
+ branch: "master"
diff --git a/jjb/vnfsdk/vnfsdk-marketplace-csit.yaml b/jjb/vnfsdk/vnfsdk-marketplace-csit.yaml
index 2a970b3..ee06edb 100644
--- a/jjb/vnfsdk/vnfsdk-marketplace-csit.yaml
+++ b/jjb/vnfsdk/vnfsdk-marketplace-csit.yaml
@@ -1,14 +1,15 @@
+---
- project:
name: vnfsdk-marketplace-csit
jobs:
- - '{project-name}-{stream}-verify-csit-{functionality}'
- - '{project-name}-{stream}-csit-{functionality}'
- project-name: 'vnfsdk-marketplace'
- recipients: 'kanagaraj.manickam@huawei.com bogumil.zebek@nokia.com bartosz.gardziejewski@nokia.com'
+ - "{project-name}-{stream}-verify-csit-{functionality}"
+ - "{project-name}-{stream}-csit-{functionality}"
+ project-name: "vnfsdk-marketplace"
+ recipients: "kanagaraj.manickam@huawei.com bogumil.zebek@nokia.com bartosz.gardziejewski@nokia.com"
stream:
- - 'master':
- branch: 'master'
+ - "master":
+ branch: "master"
functionality:
- - 'testsuites':
+ - "testsuites":
trigger_jobs:
- robot-options: ''
+ robot-options: ""
diff --git a/jjb/vnfsdk/vnfsdk-model.yaml b/jjb/vnfsdk/vnfsdk-model.yaml
index 90763d2..59cf6ee 100644
--- a/jjb/vnfsdk/vnfsdk-model.yaml
+++ b/jjb/vnfsdk/vnfsdk-model.yaml
@@ -1,10 +1,10 @@
---
- project:
name: vnfsdk-model
- project: 'vnfsdk/model'
+ project: "vnfsdk/model"
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project-name: vnfsdk-model
branch: master
mvn-settings: vnfsdk-model-settings
diff --git a/jjb/vnfsdk/vnfsdk-pkgtools-python.yaml b/jjb/vnfsdk/vnfsdk-pkgtools-python.yaml
index 6d22310..8015f03 100644
--- a/jjb/vnfsdk/vnfsdk-pkgtools-python.yaml
+++ b/jjb/vnfsdk/vnfsdk-pkgtools-python.yaml
@@ -1,43 +1,43 @@
---
- project:
name: vnfsdk-pkgtools
- project-name: 'vnfsdk-pkgtools'
+ project-name: "vnfsdk-pkgtools"
python-version: python3
- tox-dir: '.'
- tox-envs: ''
+ tox-dir: "."
+ tox-envs: ""
subproject:
- pkgtools:
- path: '.'
- pattern: '**'
- project: 'vnfsdk/pkgtools'
+ path: "."
+ pattern: "**"
+ project: "vnfsdk/pkgtools"
stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'vnfsdk-pkgtools-settings'
+ - "master":
+ branch: "master"
+ mvn-settings: "vnfsdk-pkgtools-settings"
build-node: ubuntu1804-builder-4c-4g
jobs:
- - '{project-name}-{stream}-{subproject}-verify-python'
- - '{project-name}-{subproject}-python-staging-{stream}'
- - '{project-name}-{subproject}-python-release-{stream}'
+ - "{project-name}-{stream}-{subproject}-verify-python"
+ - "{project-name}-{subproject}-python-staging-{stream}"
+ - "{project-name}-{subproject}-python-release-{stream}"
- project:
name: vnfsdk-pkgtools-tox-sonar
jobs:
- gerrit-tox-sonar
- cron: '@daily'
+ cron: "@daily"
build-node: ubuntu1804-builder-4c-4g
- project: 'vnfsdk/pkgtools'
- project-name: 'vnfsdk-pkgtools'
- branch: 'master'
- mvn-settings: 'vnfsdk-pkgtools-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ project: "vnfsdk/pkgtools"
+ project-name: "vnfsdk-pkgtools"
+ branch: "master"
+ mvn-settings: "vnfsdk-pkgtools-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
- project:
name: vnfsdk-pkgtools-info
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
- project: 'vnfsdk/pkgtools'
- project-name: 'vnfsdk-pkgtools'
- branch: 'master'
+ build-node: centos8-builder-2c-1g
+ project: "vnfsdk/pkgtools"
+ project-name: "vnfsdk-pkgtools"
+ branch: "master"
diff --git a/jjb/vnfsdk/vnfsdk-refrepo-csit.yaml b/jjb/vnfsdk/vnfsdk-refrepo-csit.yaml
index bff645b..8589598 100644
--- a/jjb/vnfsdk/vnfsdk-refrepo-csit.yaml
+++ b/jjb/vnfsdk/vnfsdk-refrepo-csit.yaml
@@ -1,14 +1,15 @@
+---
- project:
name: vnfsdk-refrepo-csit
jobs:
- - '{project-name}-{stream}-verify-csit-{functionality}'
- - '{project-name}-{stream}-csit-{functionality}'
- project-name: 'vnfsdk-refrepo'
- recipients: 'kanagaraj.manickam@huawei.com bogumil.zebek@nokia.com bartosz.gardziejewski@nokia.com'
+ - "{project-name}-{stream}-verify-csit-{functionality}"
+ - "{project-name}-{stream}-csit-{functionality}"
+ project-name: "vnfsdk-refrepo"
+ recipients: "kanagaraj.manickam@huawei.com bogumil.zebek@nokia.com bartosz.gardziejewski@nokia.com"
stream:
- - 'master':
- branch: 'master'
+ - "master":
+ branch: "master"
functionality:
- - 'testsuites':
+ - "testsuites":
trigger_jobs:
- robot-options: ''
+ robot-options: ""
diff --git a/jjb/vnfsdk/vnfsdk-refrepo.yaml b/jjb/vnfsdk/vnfsdk-refrepo.yaml
index 556c40d..c7f266a 100644
--- a/jjb/vnfsdk/vnfsdk-refrepo.yaml
+++ b/jjb/vnfsdk/vnfsdk-refrepo.yaml
@@ -1,33 +1,32 @@
---
- project:
name: vnfsdk-refrepo
- project-name: 'vnfsdk-refrepo'
+ project-name: "vnfsdk-refrepo"
jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
+ - "{project-name}-{stream}-verify-java"
+ - "{project-name}-{stream}-merge-java"
- gerrit-maven-stage:
+ sbom-generator: true
sign-artifacts: true
- build-node: centos7-builder-4c-4g
+ build-node: centos8-docker-4c-4g
maven-versions-plugin: true
- gerrit-maven-docker-stage:
- build-node: centos7-docker-8c-8g
+ build-node: centos8-docker-8c-8g
+ sbom-generator: true
maven-versions-plugin: true
- mvn-goals: 'clean package -Pdocker'
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
- project: 'vnfsdk/refrepo'
+ mvn-goals: "clean package -Pdocker"
+ container-public-registry: "nexus3.onap.org:10001"
+ container-staging-registry: "nexus3.onap.org:10003"
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
+ project: "vnfsdk/refrepo"
stream:
- - 'master':
- branch: 'master'
- java-version: openjdk11
- - 'frankfurt':
- branch: 'frankfurt'
- java-version: openjdk8
- mvn-settings: 'vnfsdk-refrepo-settings'
- files: '**'
- archive-artifacts: ''
+ - "master":
+ branch: "master"
+ java-version: openjdk11
+ mvn-settings: "vnfsdk-refrepo-settings"
+ files: "**"
+ archive-artifacts: ""
build-node: ubuntu1804-builder-4c-4g
- project:
@@ -36,41 +35,40 @@
- gerrit-maven-sonar
java-version: openjdk11
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
build-node: ubuntu1804-builder-4c-4g
- project: 'vnfsdk/refrepo'
- project-name: 'vnfsdk-refrepo'
- branch: 'master'
- mvn-settings: 'vnfsdk-refrepo-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ project: "vnfsdk/refrepo"
+ project-name: "vnfsdk-refrepo"
+ branch: "master"
+ mvn-settings: "vnfsdk-refrepo-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
- project:
name: vnfsdk-refrepo-info
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
- project: 'vnfsdk/refrepo'
- project-name: 'vnfsdk-refrepo'
- branch: 'master'
+ build-node: centos8-builder-2c-1g
+ project: "vnfsdk/refrepo"
+ project-name: "vnfsdk-refrepo"
+ branch: "master"
- project:
name: vnfsdk-refrepo-clm
java-version: openjdk11
jobs:
- gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
+ nexus-iq-namespace: "onap-"
project: vnfsdk/refrepo
- project-name: 'vnfsdk-refrepo'
+ project-name: "vnfsdk-refrepo"
build-node: ubuntu1804-builder-4c-4g
stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'vnfsdk-refrepo-settings'
+ - "master":
+ branch: "master"
+ mvn-settings: "vnfsdk-refrepo-settings"
- project:
name: vnfsdk-refrepo-sonar-verify
@@ -80,14 +78,13 @@
jobs:
- gerrit-maven-sonar-verify
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- build-node: centos7-docker-8c-8g
- project: 'vnfsdk/refrepo'
- project-name: 'vnfsdk-refrepo'
- branch: 'master'
- mvn-settings: 'vnfsdk-refrepo-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ build-node: centos8-docker-8c-8g
+ project: "vnfsdk/refrepo"
+ project-name: "vnfsdk-refrepo"
+ branch: "master"
+ mvn-settings: "vnfsdk-refrepo-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
diff --git a/jjb/vnfsdk/vnfsdk-validation.yaml b/jjb/vnfsdk/vnfsdk-validation.yaml
index f8232f8..33b3110 100644
--- a/jjb/vnfsdk/vnfsdk-validation.yaml
+++ b/jjb/vnfsdk/vnfsdk-validation.yaml
@@ -1,27 +1,25 @@
---
- project:
name: vnfsdk-validation
- project-name: 'vnfsdk-validation'
+ project-name: "vnfsdk-validation"
jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
- - gerrit-maven-stage:
- sign-artifacts: true
- build-node: centos7-builder-4c-4g
- maven-versions-plugin: true
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
- project: 'vnfsdk/validation'
+ - "{project-name}-{stream}-verify-java"
+ - "{project-name}-{stream}-merge-java"
+ - gerrit-maven-stage:
+ sbom-generator: true
+ sign-artifacts: true
+ build-node: centos8-docker-4c-4g
+ maven-versions-plugin: true
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
+ project: "vnfsdk/validation"
stream:
- - 'master':
- branch: 'master'
- java-version: openjdk11
- - 'frankfurt':
- branch: 'frankfurt'
- java-version: openjdk8
- mvn-settings: 'vnfsdk-validation-settings'
- files: '**'
- archive-artifacts: ''
+ - "master":
+ branch: "master"
+ java-version: openjdk11
+ mvn-settings: "vnfsdk-validation-settings"
+ files: "**"
+ archive-artifacts: ""
build-node: ubuntu1804-builder-4c-4g
- project:
@@ -30,56 +28,55 @@
- gerrit-maven-sonar
java-version: openjdk11
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
build-node: ubuntu1804-builder-4c-4g
- project: 'vnfsdk/validation'
- project-name: 'vnfsdk-validation'
- branch: 'master'
- mvn-settings: 'vnfsdk-validation-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ project: "vnfsdk/validation"
+ project-name: "vnfsdk-validation"
+ branch: "master"
+ mvn-settings: "vnfsdk-validation-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
- project:
name: vnfsdk-validation-info
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
- project: 'vnfsdk/validation'
- project-name: 'vnfsdk-validation'
- branch: 'master'
+ build-node: centos8-builder-2c-1g
+ project: "vnfsdk/validation"
+ project-name: "vnfsdk-validation"
+ branch: "master"
- project:
name: vnfsdk-validation-clm
java-version: openjdk11
jobs:
- gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
+ nexus-iq-namespace: "onap-"
project: vnfsdk/validation
- project-name: 'vnfsdk-validation'
+ project-name: "vnfsdk-validation"
build-node: ubuntu1804-builder-4c-4g
stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'vnfsdk-validation-settings'
+ - "master":
+ branch: "master"
+ mvn-settings: "vnfsdk-validation-settings"
- project:
- name: vnfsdk-validation-upload-docs
- project: 'vnfsdk/validation'
- project-name: 'vnfsdk-requirements'
- mvn-settings: 'vnfsdk-validation-settings'
- mvn-global-settings: 'global-settings'
- stream:
- - 'master':
- branch: 'master'
- jobs:
- - '{project-name}-{stream}-build-and-upload':
- pre_script: !include-raw-escape: ./generate-dosc.sh
- project_id: org.onap.vnfsdk.validation
- post_script: !include-raw-escape: ./upload-artifact.sh
+ name: vnfsdk-validation-upload-docs
+ project: "vnfsdk/validation"
+ project-name: "vnfsdk-requirements"
+ mvn-settings: "vnfsdk-validation-settings"
+ mvn-global-settings: "global-settings"
+ stream:
+ - "master":
+ branch: "master"
+ jobs:
+ - "{project-name}-{stream}-build-and-upload":
+ pre_script: !include-raw-escape: ./generate-dosc.sh
+ project_id: org.onap.vnfsdk.validation
+ post_script: !include-raw-escape: ./upload-artifact.sh
- project:
name: vnfsdk-validation-sonar-verify
@@ -89,14 +86,13 @@
jobs:
- gerrit-maven-sonar-verify
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- build-node: centos7-docker-8c-8g
- project: 'vnfsdk/validation'
- project-name: 'vnfsdk-validation'
- branch: 'master'
- mvn-settings: 'vnfsdk-validation-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ build-node: centos8-docker-8c-8g
+ project: "vnfsdk/validation"
+ project-name: "vnfsdk-validation"
+ branch: "master"
+ mvn-settings: "vnfsdk-validation-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
diff --git a/jjb/vvp/vvp-documentation.yaml b/jjb/vvp/vvp-documentation.yaml
index b0516ce..2df897d 100644
--- a/jjb/vvp/vvp-documentation.yaml
+++ b/jjb/vvp/vvp-documentation.yaml
@@ -1,10 +1,10 @@
---
- project:
name: vvp-documentation
- project-name: 'vvp-documentation'
- project: 'vvp/documentation'
- mvn-settings: 'vvp-documentation-settings'
+ project-name: "vvp-documentation"
+ project: "vvp/documentation"
+ mvn-settings: "vvp-documentation-settings"
branch: master
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
diff --git a/jjb/vvp/vvp-em.yaml b/jjb/vvp/vvp-em.yaml
index a0870ad..99c0409 100644
--- a/jjb/vvp/vvp-em.yaml
+++ b/jjb/vvp/vvp-em.yaml
@@ -1,10 +1,10 @@
---
- project:
name: vvp-engagementmgr
- project-name: 'vvp-engagementmgr'
- project: 'vvp/engagementmgr'
- mvn-settings: 'vvp-engagementmgr-settings'
+ project-name: "vvp-engagementmgr"
+ project: "vvp/engagementmgr"
+ mvn-settings: "vvp-engagementmgr-settings"
branch: master
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
diff --git a/jjb/vvp/vvp-oom.yaml b/jjb/vvp/vvp-oom.yaml
index 2a6b271..3da6dcd 100644
--- a/jjb/vvp/vvp-oom.yaml
+++ b/jjb/vvp/vvp-oom.yaml
@@ -1,10 +1,10 @@
---
- project:
name: vvp-oom
- project-name: 'vvp-oom'
- project: 'vvp/oom'
- mvn-settings: 'vvp-oom-settings'
+ project-name: "vvp-oom"
+ project: "vvp/oom"
+ mvn-settings: "vvp-oom-settings"
branch: master
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
diff --git a/jjb/vvp/vvp-regression.yaml b/jjb/vvp/vvp-regression.yaml
index bea93c3..265d70f 100644
--- a/jjb/vvp/vvp-regression.yaml
+++ b/jjb/vvp/vvp-regression.yaml
@@ -1,10 +1,10 @@
---
- project:
name: vvp-regression-tests
- project-name: 'vvp-regression-tests'
- project: 'vvp/regression-tests'
- mvn-settings: 'vvp-regression-tests-settings'
+ project-name: "vvp-regression-tests"
+ project: "vvp/regression-tests"
+ mvn-settings: "vvp-regression-tests-settings"
branch: master
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
diff --git a/jjb/vvp/vvp-test-engine.yaml b/jjb/vvp/vvp-test-engine.yaml
index 36a51fc..e9be3d3 100644
--- a/jjb/vvp/vvp-test-engine.yaml
+++ b/jjb/vvp/vvp-test-engine.yaml
@@ -1,9 +1,9 @@
---
- project:
name: vvp-test-engine-info
- project-name: 'vvp-test-engine'
- project: 'vvp/test-engine'
- mvn-settings: 'vvp-test-engine-settings'
+ project-name: "vvp-test-engine"
+ project: "vvp/test-engine"
+ mvn-settings: "vvp-test-engine-settings"
branch: master
jobs:
- gerrit-info-yaml-verify
@@ -14,31 +14,30 @@
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
build-node: ubuntu1804-docker-8c-8g
- project: 'vvp/test-engine'
- project-name: 'vvp-test-engine'
- branch: 'master'
- mvn-settings: 'vvp-test-engine-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ project: "vvp/test-engine"
+ project-name: "vvp-test-engine"
+ branch: "master"
+ mvn-settings: "vvp-test-engine-settings"
+ mvn-goals: "clean install"
+ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
- project:
name: vvp-test-engine-verify
- project-name: 'vvp-test-engine'
- project: 'vvp/test-engine'
+ project-name: "vvp-test-engine"
+ project: "vvp/test-engine"
stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'vvp-test-engine-settings'
- build-node: 'centos8-builder-4c-4g'
+ - "master":
+ branch: "master"
+ mvn-settings: "vvp-test-engine-settings"
+ build-node: "centos8-builder-4c-4g"
subproject:
- - 'onap-client':
- path: 'onap-client'
- pattern: 'onap-client/**'
+ - "onap-client":
+ path: "onap-client"
+ pattern: "onap-client/**"
jobs:
- - '{project-name}-{stream}-{subproject}-verify-python'
+ - "{project-name}-{stream}-{subproject}-verify-python"
diff --git a/jjb/vvp/vvp-validation-scripts.yaml b/jjb/vvp/vvp-validation-scripts.yaml
index 9f9b85e..d653999 100644
--- a/jjb/vvp/vvp-validation-scripts.yaml
+++ b/jjb/vvp/vvp-validation-scripts.yaml
@@ -1,57 +1,55 @@
---
-
- project:
name: vvp-validation-scripts
- project-name: 'vvp-validation-scripts'
- project: 'vvp/validation-scripts'
+ project-name: "vvp-validation-scripts"
+ project: "vvp/validation-scripts"
stream:
- - 'master':
- branch: 'master'
+ - "master":
+ branch: "master"
subproject:
- validation-scripts:
- path: '.'
- pattern: '**'
- mvn-settings: 'vvp-validation-scripts-settings'
+ path: "."
+ pattern: "**"
+ mvn-settings: "vvp-validation-scripts-settings"
build-node: ubuntu1804-docker-8c-8g
jobs:
- - '{project-name}-{stream}-{subproject}-verify-python'
- - '{project-name}-{stream}-docker-java-daily':
- mvn-params: '-Dmaven.test.skip=true'
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
- docker-pom: 'pom.xml'
- mvn-profile: 'default'
+ - "{project-name}-{stream}-{subproject}-verify-python"
+ - "{project-name}-{stream}-docker-java-daily":
+ mvn-params: "-Dmaven.test.skip=true"
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
+ docker-pom: "pom.xml"
+ mvn-profile: "default"
- project:
name: vvp-validation-scripts-sonar
jobs:
- gerrit-maven-sonar
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+ sonar-mvn-goal: "{sonar_mvn_goal}"
+ cron: "@daily"
build-node: ubuntu1804-docker-8c-8g
- project: 'vvp/validation-scripts'
- project-name: 'vvp-validation-scripts'
- branch: 'master'
- mvn-settings: 'vvp-validation-scripts-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ project: "vvp/validation-scripts"
+ project-name: "vvp-validation-scripts"
+ branch: "master"
+ 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'
+ project: "vvp/validation-scripts"
+ project-name: "vvp-validation-scripts"
build-node: ubuntu1804-docker-8c-8g
- mvn-settings: 'vvp-validation-scripts-settings'
- mvn-global-settings: 'global-settings'
+ mvn-settings: "vvp-validation-scripts-settings"
+ mvn-global-settings: "global-settings"
stream:
- - 'master':
- branch: 'master'
+ - "master":
+ branch: "master"
jobs:
- - '{project-name}-{stream}-build-and-upload':
+ - "{project-name}-{stream}-build-and-upload":
pre_script: !include-raw-escape: pre-build-csv.sh
artifact_name: traceability.csv rst.csv
project_id: org.onap.vvp.validation-scripts
diff --git a/packer/README.markdown b/packer/README.markdown
index 1ef176a..597e64b 100644
--- a/packer/README.markdown
+++ b/packer/README.markdown
@@ -26,12 +26,12 @@
From a high level, the builds:
-* Boot a specified base image in the cloud
-* Run a set of shell scripts, listed in the template's shell provisioner
- section, to do any configuration required by the builder.
-* Execute a shutdown of the running instance
-* Execute a 'nova image-create' operation against the shutdown instance.
-* Perform a 'nova delete' operation against the shutdown instance.
+- Boot a specified base image in the cloud
+- Run a set of shell scripts, listed in the template's shell provisioner
+ section, to do any configuration required by the builder.
+- Execute a shutdown of the running instance
+- Execute a 'nova image-create' operation against the shutdown instance.
+- Perform a 'nova delete' operation against the shutdown instance.
[1]: https://www.packer.io/
[2]: https://www.packer.io/intro/getting-started/setup.html
diff --git a/packer/provision/helm.yaml b/packer/provision/helm.yaml
index d3ab71b..4ccbecd 100644
--- a/packer/provision/helm.yaml
+++ b/packer/provision/helm.yaml
@@ -6,93 +6,69 @@
become_method: sudo
vars:
- kubectl_version: 1.23.7
- helm3_6_version: 3.6.3
+ kubectl_version: 1.23.8
helm3_8_version: 3.8.2
- chartmuseum_version: 0.12.0
+ chartmuseum_version: 0.15.0
tasks:
- - name: 'Install kubectl {{kubectl_version}}'
+ - name: "Install kubectl {{kubectl_version}}"
get_url:
url: "https://storage.googleapis.com/kubernetes-release/release/v{{kubectl_version}}/bin/linux/amd64/kubectl"
dest: /usr/local/bin/kubectl
mode: 0775
- become: yes
+ become: true
- - name: 'Install Helm3.6 {{helm3_6_version}}'
+ - name: "Install Helm3.8 {{helm3_8_version}}"
block:
- - name: 'Create directory /tmp/helm3.6'
- file:
- path: /tmp/helm3.6
- state: directory
- - name: 'Fetch tar.gz for Helm 3.6'
- get_url:
- url: "https://get.helm.sh/helm-v{{helm3_6_version}}-linux-amd64.tar.gz"
- dest: /tmp/helm3.6
- - name: 'Unarchive Helm 3.6'
- unarchive:
- src: "/tmp/helm3.6/helm-v{{helm3_6_version}}-linux-amd64.tar.gz"
- dest: /tmp/helm3.6
- remote_src: true
- become: yes
- - name: 'Move Helm 3.6 bin to /usr/local/bin and set as executable'
- command: 'mv /tmp/helm3.6/linux-amd64/helm /usr/local/bin/helm3.6'
- become: yes
- - name: 'Check Helm 3.6'
- command: 'which helm3.6'
- - name: 'Check kubectl {{kubectl_version}}'
- command: 'which kubectl'
-
- - name: 'Install Helm 3.6'
- shell: |
- echo "----> Installing helm3.6"
- wget 'https://get.helm.sh/helm-v{{helm3_6_version}}-linux-amd64.tar.gz'
- tar -xvf 'https://get.helm.sh/helm-v{{helm3_6_version}}-linux-amd64.tar.gz'
- mv linux-amd64/helm /usr/local/bin/helm3.6
- which helm3.6
- become: true
-
- - name: 'Install Helm3.8 {{helm3_8_version}}'
- block:
- - name: 'Create directory /tmp/helm3.8'
+ - name: "Create directory /tmp/helm3.8"
file:
path: /tmp/helm3.8
state: directory
- - name: 'Fetch tar.gz for Helm 3.8'
+ - name: "Fetch tar.gz for Helm 3.8"
get_url:
url: "https://get.helm.sh/helm-v{{helm3_8_version}}-linux-amd64.tar.gz"
dest: /tmp/helm3.8
- - name: 'Unarchive Helm 3.8'
+ - name: "Unarchive Helm 3.8"
unarchive:
src: "/tmp/helm3.8/helm-v{{helm3_8_version}}-linux-amd64.tar.gz"
dest: /tmp/helm3.8
remote_src: true
- become: yes
- - name: 'Move Helm 3.8 bin to /usr/local/bin and set as executable'
- command: 'mv /tmp/helm3.8/linux-amd64/helm /usr/local/bin/helm3.8'
- become: yes
- - name: 'Check Helm 3.8'
- command: 'which helm3.8'
- - name: 'Check kubectl {{kubectl_version}}'
- command: 'which kubectl'
+ become: true
+ - name: "Move Helm 3.8 bin to /usr/local/bin and set as executable"
+ command: "mv /tmp/helm3.8/linux-amd64/helm /usr/local/bin/helm3.8"
+ become: true
+ - name: "Check Helm 3.8"
+ command: "which helm3.8"
+ - name: "Check kubectl {{kubectl_version}}"
+ command: "which kubectl"
- - name: 'Install Helm 3.8'
+ - name: "Install Helm 3.8"
shell: |
- echo "----> Installing helm3.8"
- wget 'https://get.helm.sh/helm-v{{helm3_8_version}}-linux-amd64.tar.gz'
- tar -xvf 'https://get.helm.sh/helm-v{{helm3_8_version}}-linux-amd64.tar.gz'
- mv linux-amd64/helm /usr/local/bin/helm3.8
- which helm3.8
+ echo "----> Installing helm3.8"
+ wget 'https://get.helm.sh/helm-v{{helm3_8_version}}-linux-amd64.tar.gz'
+ tar -xvf 'https://get.helm.sh/helm-v{{helm3_8_version}}-linux-amd64.tar.gz'
+ mv linux-amd64/helm /usr/local/bin/helm3.8
+ which helm3.8
become: true
-
- - name: 'Install ChartMuseum {{chartmuseum_version}}'
+ - name: "Install ChartMuseum {{chartmuseum_version}}"
block:
- - name: 'Fetch bin for ChartMuseum'
+ - name: "Create directory /tmp/chartmuseum"
+ file:
+ path: /tmp/chartmuseum
+ state: directory
+ - name: "Fetch tar.gz for chartmuseum"
get_url:
- url: "https://s3.amazonaws.com/chartmuseum/release/v{{ chartmuseum_version }}/bin/linux/amd64/chartmuseum"
- dest: /usr/local/bin/chartmuseum
- mode: "0755"
- become: yes
- - name: 'Check ChartMuseum {{chartmuseum_version}}'
- command: 'which chartmuseum'
+ url: "https://get.helm.sh/chartmuseum-v{{chartmuseum_version}}-linux-amd64.tar.gz"
+ dest: /tmp/chartmuseum
+ - name: "Unarchive chartmuseum"
+ unarchive:
+ src: "/tmp/chartmuseum/chartmuseum-v{{chartmuseum_version}}-linux-amd64.tar.gz"
+ dest: /tmp/chartmuseum
+ remote_src: true
+ become: true
+ - name: "Move chartmuseum bin to /usr/local/bin and set as executable"
+ command: "mv /tmp/chartmuseum/linux-amd64/chartmuseum /usr/local/bin/chartmuseum"
+ become: true
+ - name: "Check ChartMuseum {{chartmuseum_version}}"
+ command: "which chartmuseum"
diff --git a/packer/provision/local-builder.yaml b/packer/provision/local-builder.yaml
index fa969d5..c12259f 100644
--- a/packer/provision/local-builder.yaml
+++ b/packer/provision/local-builder.yaml
@@ -14,8 +14,8 @@
- name: Update and upgrade apt packages
apt:
- upgrade: 'yes'
- update_cache: yes
+ upgrade: "yes"
+ update_cache: true
become: true
when: ansible_distribution == 'Ubuntu'
@@ -63,27 +63,11 @@
- name: Install libssl1.0-dev dep
apt:
name: libssl1.0-dev
- update_cache: yes
+ update_cache: true
state: fixed
become: true
when: ansible_distribution == 'Ubuntu' and ansible_distribution_version == '18.04'
- - name: Install nodejs-dev dep for npm
- apt:
- name: nodejs-dev
- update_cache: yes
- state: fixed
- become: true
- when: ansible_distribution == 'Ubuntu' and ansible_distribution_version == '18.04'
-
- - name: Install libnode-dev dep for npm
- apt:
- name: libnode-dev
- update_cache: yes
- state: fixed
- become: true
- when: ansible_distribution == 'Ubuntu' and ansible_distribution_version == '20.04'
-
- name: Install supporting packages (Ubuntu 18.04)
apt:
name:
@@ -101,7 +85,7 @@
- crudini
- maven
- python-ncclient
- update_cache: yes
+ update_cache: true
state: fixed
become: true
when: ansible_distribution == 'Ubuntu' and ansible_distribution_version == '18.04'
@@ -123,18 +107,27 @@
- crudini
- maven
- python3-ncclient
- update_cache: yes
+ update_cache: true
state: fixed
become: true
when: ansible_distribution == 'Ubuntu' and ansible_distribution_version == '20.04'
- - name: Install npm and addon packages
+ - name: Install nodejs and npm
+ block:
+ - name: "Pull latest nodejs version"
+ shell: |
+ curl -sL https://deb.nodesource.com/setup_10.x | sudo -E bash - && sudo apt-get install -y nodejs
+ become: true
+ - name: "Check nodejs version"
+ command: node --version
+ - name: "Check npm version"
+ command: npm --version
+ when: ansible_distribution == 'Ubuntu'
+
+ - name: Install npm build tools
apt:
- name:
- - nodejs
- - npm
- - node-gyp
- update_cache: yes
+ name: build-essential
+ update_cache: true
state: fixed
become: true
when: ansible_distribution == 'Ubuntu'
@@ -143,7 +136,7 @@
apt:
name:
- enchant-2
- update_cache: yes
+ update_cache: true
state: present
become: true
when: ansible_distribution == 'Ubuntu' and ansible_distribution_version == '20.04'
@@ -152,7 +145,7 @@
apt:
name:
- enchant
- update_cache: yes
+ update_cache: true
state: present
become: true
when: ansible_distribution == 'Ubuntu' and ansible_distribution_version == '18.04'
@@ -161,7 +154,7 @@
dnf:
name:
- enchant2
- update_cache: yes
+ update_cache: true
state: present
become: true
when: ansible_distribution == 'CentOS'
diff --git a/packer/provision/local-docker.yaml b/packer/provision/local-docker.yaml
index 32aa2c3..b7e1c55 100644
--- a/packer/provision/local-docker.yaml
+++ b/packer/provision/local-docker.yaml
@@ -10,7 +10,7 @@
glide_checksum: sha256:c403933503ea40308ecfadcff581ff0dc3190c57958808bb9eed016f13f6f32c
glide_version: v0.13.1
golang_version: 1.9.1
- npm_version: "6.14.13"
+ npm_version: "9.6.4"
tasks:
- name: "Checking for x86_64"
@@ -25,7 +25,8 @@
golang_checksum: sha256:d31ecae36efea5197af271ccce86ccc2baf10d2e04f20d0fb75556ecf0614dad
when: "'aarch64' in ansible_architecture"
- - name: 'Install Docker Compose {{docker_compose_version}}'
+ - name: "Install Docker Compose {{docker_compose_version}}"
+ # yamllint disable-line rule:line-length
command: curl -o /usr/local/bin/docker-compose -L "https://github.com/docker/compose/releases/download/{{docker_compose_version}}/docker-compose-Linux-x86_64"
become: true
@@ -34,16 +35,16 @@
mode: "+x"
become: true
- - name: 'Install GoLang {{golang_version}}'
+ - name: "Install GoLang {{golang_version}}"
block:
- - name: 'Fetch golang {{golang_version}} to /tmp/go{{golang_version}}.linux-{{host_arch}}.tar.gz'
+ - name: "Fetch golang {{golang_version}} to /tmp/go{{golang_version}}.linux-{{host_arch}}.tar.gz"
get_url:
- url: 'https://storage.googleapis.com/golang/go{{golang_version}}.linux-{{host_arch}}.tar.gz'
- dest: '/tmp/go{{golang_version}}.linux-{{host_arch}}.tar.gz'
- checksum: '{{golang_checksum}}'
- - name: 'Install golang {{golang_version}} to /usr/local'
+ url: "https://storage.googleapis.com/golang/go{{golang_version}}.linux-{{host_arch}}.tar.gz"
+ dest: "/tmp/go{{golang_version}}.linux-{{host_arch}}.tar.gz"
+ checksum: "{{golang_checksum}}"
+ - name: "Install golang {{golang_version}} to /usr/local"
unarchive:
- src: '/tmp/go{{golang_version}}.linux-{{host_arch}}.tar.gz'
+ src: "/tmp/go{{golang_version}}.linux-{{host_arch}}.tar.gz"
dest: /usr/local
remote_src: true
become: true
@@ -69,8 +70,8 @@
- name: Update and upgrade apt packages
apt:
- upgrade: 'yes'
- update_cache: yes
+ upgrade: "yes"
+ update_cache: true
become: true
when: ansible_distribution == 'Ubuntu'
@@ -115,32 +116,6 @@
become: true
when: ansible_distribution == 'Ubuntu'
- - name: Install nodejs-dev libssl1.0-dev dep
- apt:
- name:
- - libssl1.0-dev
- update_cache: yes
- state: fixed
- become: true
- when: ansible_distribution == 'Ubuntu' and ansible_distribution_version == '18.04'
-
- - name: Install nodejs-dev dep for npm
- apt:
- name:
- - nodejs-dev
- update_cache: yes
- state: fixed
- become: true
- when: ansible_distribution == 'Ubuntu' and ansible_distribution_version == '18.04'
-
- - name: Install libnode-dev dep for npm
- apt:
- name: libnode-dev
- update_cache: yes
- state: fixed
- become: true
- when: ansible_distribution == 'Ubuntu' and ansible_distribution_version == '20.04'
-
- name: Install supporting packages (Ubuntu 18.04)
apt:
name:
@@ -158,7 +133,7 @@
- crudini
- maven
- python-ncclient
- update_cache: yes
+ update_cache: true
state: fixed
become: true
when: ansible_distribution == 'Ubuntu' and ansible_distribution_version == '18.04'
@@ -180,18 +155,52 @@
- crudini
- maven
- python3-ncclient
- update_cache: yes
+ update_cache: true
state: fixed
become: true
when: ansible_distribution == 'Ubuntu' and ansible_distribution_version == '20.04'
- - name: Install npm and addon packages
+ - name: Install nodejs
+ block:
+ - name: install nodejs prerequisites
+ apt:
+ name:
+ - apt-transport-https
+ - g++
+ update_cache: true
+ state: present
+ become: true
+ - name: add nodejs apt key
+ apt_key:
+ url: https://deb.nodesource.com/gpgkey/nodesource.gpg.key
+ state: present
+ become: true
+ - name: add nodejs repository
+ apt_repository:
+ repo: deb https://deb.nodesource.com/node_19.x {{ ansible_distribution_release }} main
+ state: present
+ update_cache: true
+ become: true
+ - name: install nodejs
+ apt:
+ name:
+ - nodejs
+ state: present
+ become: true
+ when: ansible_distribution == 'Ubuntu'
+
+ - name: Check nodejs and npm versions
+ block:
+ - name: "Check nodejs version"
+ command: node --version
+ - name: "Check npm version"
+ command: npm --version
+ when: ansible_distribution == 'Ubuntu'
+
+ - name: Install npm build tools
apt:
- name:
- - nodejs
- - npm
- - node-gyp
- update_cache: yes
+ name: build-essential
+ update_cache: true
state: fixed
become: true
when: ansible_distribution == 'Ubuntu'
@@ -219,6 +228,7 @@
when: ansible_architecture == 'x86_64' and ansible_distribution == 'Ubuntu'
- name: Add Google Chrome repo
+ # yamllint disable-line rule:line-length
copy: content="deb http://dl.google.com/linux/chrome/deb/ stable main" dest={{apt_file}} owner=root group=root mode=644
become: true
when: ansible_architecture == 'x86_64' and ansible_distribution == 'Ubuntu'
@@ -248,6 +258,7 @@
name:
- libwxgtk3.0-0v5
become: true
+ # yamllint disable-line rule:line-length
when: ansible_architecture == 'x86_64' and ansible_distribution == 'Ubuntu' and ansible_distribution_version == '18.04'
- name: Install Erlang dependency package libwxgtk3 for 20.04
@@ -255,12 +266,14 @@
name:
- libwxgtk3.0-gtk3-0v5
become: true
+ # yamllint disable-line rule:line-length
when: ansible_architecture == 'x86_64' and ansible_distribution == 'Ubuntu' and ansible_distribution_version == '20.04'
- name: Download and install libssl Ubuntu 20.04
apt:
- deb: http://security.ubuntu.com/ubuntu/pool/main/o/openssl1.0/libssl1.0.0_1.0.2n-1ubuntu5.10_amd64.deb
+ deb: http://security.ubuntu.com/ubuntu/pool/main/o/openssl1.0/libssl1.0.0_1.0.2n-1ubuntu5.11_amd64.deb
become: true
+ # yamllint disable-line rule:line-length
when: ansible_architecture == 'x86_64' and ansible_distribution == 'Ubuntu' and ansible_distribution_version == '20.04'
- name: Install Erlang
@@ -269,7 +282,7 @@
become: true
when: ansible_architecture == 'x86_64' and ansible_distribution == 'Ubuntu'
- - name: 'Download latest rebar3 bin'
+ - name: "Download latest rebar3 bin"
command: curl -o /usr/bin/rebar3 -L "https://s3.amazonaws.com/rebar3/rebar3"
become: true
when: ansible_architecture == 'x86_64' and ansible_distribution == 'Ubuntu'
@@ -285,16 +298,17 @@
src: https://github.com/mozilla/geckodriver/releases/download/v0.18.0/geckodriver-v0.18.0-linux64.tar.gz
dest: /usr/bin
mode: 0755
- remote_src: yes
+ remote_src: true
become: true
when: ansible_architecture == 'x86_64' and ansible_distribution == 'Ubuntu'
- name: Download Firefox version 55.0.3
unarchive:
+ # yamllint disable-line rule:line-length
src: https://download-installer.cdn.mozilla.net/pub/firefox/releases/55.0.3/linux-x86_64/en-US/firefox-55.0.3.tar.bz2
dest: /opt
mode: 0755
- remote_src: yes
+ remote_src: true
become: true
when: ansible_architecture == 'x86_64' and ansible_distribution == 'Ubuntu'
diff --git a/packer/provision/memcached.yaml b/packer/provision/memcached.yaml
index 02d3a80..593f986 100644
--- a/packer/provision/memcached.yaml
+++ b/packer/provision/memcached.yaml
@@ -6,7 +6,7 @@
become_method: sudo
tasks:
- - name: 'Install Memcached'
+ - name: "Install Memcached"
package:
name: memcached
state: present
diff --git a/packer/provision/redis.yaml b/packer/provision/redis.yaml
index b97437b..698665f 100644
--- a/packer/provision/redis.yaml
+++ b/packer/provision/redis.yaml
@@ -6,19 +6,19 @@
become_method: sudo
tasks:
- - name: 'Install Redis'
+ - name: "Install Redis"
package:
name: redis
state: present
become: true
- - name: 'Enable service redis'
+ - name: "Enable service redis"
service:
name: redis
- enabled: yes
+ enabled: true
become: true
- - name: 'Start service redis'
+ - name: "Start service redis"
service:
name: redis
state: started
@@ -29,6 +29,6 @@
name:
- epel-release
- python36
- update_cache: yes
+ update_cache: true
state: latest
become: true
diff --git a/packer/templates/helm.json b/packer/templates/helm.json
index cdf752a..621c997 100644
--- a/packer/templates/helm.json
+++ b/packer/templates/helm.json
@@ -27,9 +27,7 @@
"tenant_name": "{{user `cloud_tenant`}}",
"domain_name": "Default",
"region": "ca-ymq-1",
- "networks": [
- "{{user `cloud_network`}}"
- ],
+ "networks": ["{{user `cloud_network`}}"],
"user_data_file": "{{user `cloud_user_data`}}",
"ssh_username": "{{user `ssh_user`}}",
"ssh_proxy_host": "{{user `ssh_proxy_host`}}",
@@ -42,9 +40,7 @@
"provisioners": [
{
"type": "shell",
- "scripts": [
- "common-packer/provision/install-python.sh"
- ],
+ "scripts": ["common-packer/provision/install-python.sh"],
"execute_command": "chmod +x {{ .Path }}; if [ \"$UID\" == \"0\" ]; then {{ .Vars }} '{{ .Path }}'; else {{ .Vars }} sudo -E '{{ .Path }}'; fi"
},
{
@@ -53,6 +49,8 @@
},
{
"type": "ansible",
+ "command": "./common-packer/ansible-playbook.sh",
+ "skip_version_check": true,
"playbook_file": "provision/helm.yaml",
"ansible_env_vars": [
"ANSIBLE_NOCOWS=1",
diff --git a/packer/templates/memcached.json b/packer/templates/memcached.json
index 6554fb6..c05aeb2 100644
--- a/packer/templates/memcached.json
+++ b/packer/templates/memcached.json
@@ -26,9 +26,7 @@
"tenant_name": "{{user `cloud_tenant`}}",
"domain_name": "Default",
"region": "ca-ymq-1",
- "networks": [
- "{{user `cloud_network`}}"
- ],
+ "networks": ["{{user `cloud_network`}}"],
"user_data_file": "{{user `cloud_user_data`}}",
"ssh_username": "{{user `ssh_user`}}",
"ssh_proxy_host": "{{user `ssh_proxy_host`}}",
@@ -41,9 +39,7 @@
"provisioners": [
{
"type": "shell",
- "scripts": [
- "common-packer/provision/install-python.sh"
- ],
+ "scripts": ["common-packer/provision/install-python.sh"],
"execute_command": "chmod +x {{ .Path }}; if [ \"$UID\" == \"0\" ]; then {{ .Vars }} '{{ .Path }}'; else {{ .Vars }} sudo -E '{{ .Path }}'; fi"
},
{
@@ -52,6 +48,8 @@
},
{
"type": "ansible",
+ "command": "./common-packer/ansible-playbook.sh",
+ "skip_version_check": true,
"playbook_file": "provision/memcached.yaml",
"ansible_env_vars": [
"ANSIBLE_NOCOWS=1",
diff --git a/packer/templates/redis.json b/packer/templates/redis.json
index 6bf7b17..ae58a61 100644
--- a/packer/templates/redis.json
+++ b/packer/templates/redis.json
@@ -24,9 +24,7 @@
"tenant_name": "{{user `cloud_tenant`}}",
"domain_name": "Default",
"region": "ca-ymq-1",
- "networks": [
- "{{user `cloud_network`}}"
- ],
+ "networks": ["{{user `cloud_network`}}"],
"user_data_file": "{{user `cloud_user_data`}}",
"ssh_username": "{{user `ssh_user`}}",
"ssh_proxy_host": "{{user `ssh_proxy_host`}}",
@@ -39,9 +37,7 @@
"provisioners": [
{
"type": "shell",
- "scripts": [
- "common-packer/provision/install-python.sh"
- ],
+ "scripts": ["common-packer/provision/install-python.sh"],
"execute_command": "chmod +x {{ .Path }}; if [ \"$UID\" == \"0\" ]; then {{ .Vars }} '{{ .Path }}'; else {{ .Vars }} sudo -E '{{ .Path }}'; fi"
},
{
@@ -50,6 +46,8 @@
},
{
"type": "ansible",
+ "command": "./common-packer/ansible-playbook.sh",
+ "skip_version_check": true,
"playbook_file": "provision/redis.yaml",
"ansible_env_vars": [
"ANSIBLE_NOCOWS=1",
diff --git a/shell/apply-submodule-patch-oom.sh b/shell/apply-submodule-patch-oom.sh
deleted file mode 100644
index ad818fb..0000000
--- a/shell/apply-submodule-patch-oom.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-# SPDX-License-Identifier: EPL-1.0
-##############################################################################
-# Copyright (c) 2019 The Linux Foundation and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-##############################################################################
-
-# Update kubernetes submodule under oom with patch to be verified
-
-echo '--> apply-submodule-patch-oom.sh'
-cd kubernetes/${HELM_MODULE}
-remote_path=`git remote -v | grep fetch | awk '{print $2}'`
-git fetch ${remote_path} $GERRIT_REFSPEC && git cherry-pick FETCH_HEAD
-cd ../..
diff --git a/shell/helm/helm-install.sh b/shell/helm/helm-install.sh
new file mode 100755
index 0000000..9fa2477
--- /dev/null
+++ b/shell/helm/helm-install.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+# Ensure we fail the job if any steps fail
+set -e -o pipefail
+
+echo "Installing helm ${HELM_VER}"
+mkdir /tmp/helm"${HELM_VER}"
+cd /tmp/helm"${HELM_VER}"
+wget "https://get.helm.sh/helm-v${HELM_VER}-linux-amd64.tar.gz"
+tar xvf helm-v"${HELM_VER}"-linux-amd64.tar.gz
+sudo mv linux-amd64/helm /usr/local/bin/helm"${HELM_VER}"
+which helm"${HELM_VER}"
+cd ~/
+echo "Completed install of helm ${HELM_VER}"
+
diff --git a/shell/helm-repo-init.sh b/shell/helm/helm-repo-init.sh
similarity index 79%
rename from shell/helm-repo-init.sh
rename to shell/helm/helm-repo-init.sh
index 3228aa3..f1ef7aa 100755
--- a/shell/helm-repo-init.sh
+++ b/shell/helm/helm-repo-init.sh
@@ -5,7 +5,6 @@
mkdir -p ".chartstorage"
chartmuseum --port=6464 --storage="local" --storage-local-rootdir=".chartstorage" &> /dev/null &
-source helm.prop
-$HELM_BIN plugin install --version v0.10.2 https://github.com/chartmuseum/helm-push.git || true
+$HELM_BIN plugin install --version v0.10.3 https://github.com/chartmuseum/helm-push.git || true
$HELM_BIN repo add local http://localhost:6464
$HELM_BIN repo add onap http://localhost:6464
diff --git a/shell/helm/make-helm-all.sh b/shell/helm/make-helm-all.sh
new file mode 100755
index 0000000..862f422
--- /dev/null
+++ b/shell/helm/make-helm-all.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+# Ensure we fail the job if any steps fail
+set -e -o pipefail
+cd kubernetes/
+make HELM_BIN=$HELM_BIN all -j2
diff --git a/shell/helm/make-helm-skip-lint.sh b/shell/helm/make-helm-skip-lint.sh
new file mode 100755
index 0000000..0a64365
--- /dev/null
+++ b/shell/helm/make-helm-skip-lint.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+# Ensure we fail the job if any steps fail
+set -e -o pipefail
+cd kubernetes/
+make HELM_BIN=$HELM_BIN SKIP_LINT=TRUE all -j2
diff --git a/shell/oom-create-netrc.sh b/shell/helm/oom-create-netrc.sh
similarity index 100%
rename from shell/oom-create-netrc.sh
rename to shell/helm/oom-create-netrc.sh
diff --git a/shell/publish_helm_charts.sh b/shell/helm/publish_helm_charts.sh
similarity index 67%
rename from shell/publish_helm_charts.sh
rename to shell/helm/publish_helm_charts.sh
index 4cc27fe..4601743 100755
--- a/shell/publish_helm_charts.sh
+++ b/shell/helm/publish_helm_charts.sh
@@ -1,7 +1,7 @@
#!/bin/bash
set -e -o pipefail
-echo "*** starting releace process for $BUILD_TYPE"
+echo "*** starting chart publish process for $BUILD_TYPE"
cd kubernetes/dist/packages/ || exit
helm_charts=()
while IFS= read -a line; do
@@ -16,19 +16,15 @@
echo " * snapshot build, pushing to https://nexus3.onap.org/repository/onap-helm-testing/"
curl -vn --upload-file "$chart" "https://nexus3.onap.org/repository/onap-helm-testing/"
;;
- 'staging')
- echo " * staging build, pushing to https://nexus3.onap.org/repository/onap-helm-testing/"
- curl -vn --upload-file "$chart" "https://nexus3.onap.org/repository/onap-helm-testing/"
- ;;
'release')
echo " * release build, pushing to https://nexus3.onap.org/repository/onap-helm-release/"
curl -vn --upload-file "$chart" "https://nexus3.onap.org/repository/onap-helm-release/"
;;
*)
- echo "You must set BUILD_TYPE to one of (snapshot, staging, release)."
+ echo "You must set BUILD_TYPE to one of (snapshot, release)."
exit 1
;;
esac
done
-echo "*** release process finished"
+echo "*** chart publish process finished"
cd ../../../