Merge "[VFC] Change the build node for vfc-lcm sonar job"

diff --git a/jjb/ccsdk/apps.yaml b/jjb/ccsdk/apps.yaml
index 775f856..2044e81 100644 (file)
--- a/jjb/ccsdk/apps.yaml
+++ b/jjb/ccsdk/apps.yaml
@@ -34,6 +34,8 @@
           branch: 'master'
       - 'istanbul':
           branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
     java-version: openjdk11
     mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-apps-settings'
@@ -80,6 +82,8 @@
           branch: 'master'
       - 'istanbul':
           branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
     java-version: openjdk11
     mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-apps-settings'

diff --git a/jjb/ccsdk/ccsdk-csit.yaml b/jjb/ccsdk/ccsdk-csit.yaml
index c8af14c..ead2542 100644 (file)
--- a/jjb/ccsdk/ccsdk-csit.yaml
+++ b/jjb/ccsdk/ccsdk-csit.yaml
@@ -15,10 +15,10 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'honolulu':
-          branch: 'honolulu'
       - 'istanbul':
           branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
     mvn-settings: 'ccsdk-distribution-settings'
     robot-options: ''
     branch: 'master'
@@ -37,10 +37,10 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'honolulu':
-          branch: 'honolulu'
       - 'istanbul':
           branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
     mvn-settings: 'ccsdk-oran-settings'
     robot-options: ''
     branch: 'master'

diff --git a/jjb/ccsdk/ccsdk-oran.yaml b/jjb/ccsdk/ccsdk-oran.yaml
index 5a61506..88ccf2e 100644 (file)
--- a/jjb/ccsdk/ccsdk-oran.yaml
+++ b/jjb/ccsdk/ccsdk-oran.yaml
@@ -29,6 +29,8 @@
           branch: 'master'
       - 'istanbul':
           branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
     java-version: openjdk11
     mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-oran-settings'
@@ -52,6 +54,8 @@
           branch: 'master'
       - 'istanbul':
           branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
     java-version: openjdk11
     mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-oran-settings'

diff --git a/jjb/ccsdk/cds.yaml b/jjb/ccsdk/cds.yaml
index f0fd25f..f0870f6 100644 (file)
--- a/jjb/ccsdk/cds.yaml
+++ b/jjb/ccsdk/cds.yaml
@@ -28,6 +28,8 @@
           branch: 'master'
       - 'istanbul':
           branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
     java-version: openjdk11
     mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-cds-settings'
@@ -113,6 +115,8 @@
           branch: 'master'
       - 'istanbul':
           branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
     java-version: openjdk11
     mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-cds-settings'

diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml
index 4a24dd2..265a696 100644 (file)
--- a/jjb/ccsdk/distribution.yaml
+++ b/jjb/ccsdk/distribution.yaml
@@ -30,6 +30,8 @@
           branch: 'master'
       - 'istanbul':
           branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
     java-version: openjdk11
     mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-distribution-settings'
@@ -71,6 +73,8 @@
           branch: 'master'
       - 'istanbul':
           branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
     java-version: openjdk11
     mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-distribution-settings'

diff --git a/jjb/ccsdk/features.yaml b/jjb/ccsdk/features.yaml
index ba34b88..27bddeb 100644 (file)
--- a/jjb/ccsdk/features.yaml
+++ b/jjb/ccsdk/features.yaml
@@ -22,6 +22,8 @@
           branch: 'master'
       - 'istanbul':
           branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
     java-version: openjdk11
     mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-features-settings'
@@ -69,6 +71,8 @@
           branch: 'master'
       - 'istanbul':
           branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
     java-version: openjdk11
     mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-features-settings'

diff --git a/jjb/ccsdk/parent.yaml b/jjb/ccsdk/parent.yaml
index d3d780c..13976b7 100644 (file)
--- a/jjb/ccsdk/parent.yaml
+++ b/jjb/ccsdk/parent.yaml
@@ -33,6 +33,8 @@
                 mvn-params: '-Drevision=3.0.0'
       - 'istanbul':
           branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
     java-version: openjdk11
     mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-parent-settings'
@@ -56,6 +58,8 @@
           branch: 'master'
       - 'istanbul':
           branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
     java-version: openjdk11
     mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-parent-settings'

diff --git a/jjb/ccsdk/sli.yaml b/jjb/ccsdk/sli.yaml
index 34f56cd..f0ac46b 100644 (file)
--- a/jjb/ccsdk/sli.yaml
+++ b/jjb/ccsdk/sli.yaml
@@ -22,6 +22,8 @@
           branch: 'master'
       - 'istanbul':
           branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
     java-version: openjdk11
     mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-sli-settings'
@@ -68,6 +70,8 @@
           branch: 'master'
       - 'istanbul':
           branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
     java-version: openjdk11
     mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-sli-settings'

diff --git a/jjb/cli/cli.yaml b/jjb/cli/cli.yaml
index 3f182ec..bc94556 100644 (file)
--- a/jjb/cli/cli.yaml
+++ b/jjb/cli/cli.yaml
@@ -100,3 +100,23 @@
     build-node: centos7-builder-2c-1g
     project: cli
     branch: master
+
+- project:
+    name: cli-sonar-verify
+    java-version: openjdk11
+    mvn-version: "mvn36"
+    maven-version: "mvn36"
+    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: 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'

diff --git a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
index 4a4f21f..7fa8ef5 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
@@ -8,6 +8,7 @@
       - '{project-name}-{stream}-merge-java'
       - gerrit-maven-stage:
           sign-artifacts: false
+          sbom-generator: true
           build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:

diff --git a/jjb/doc/doc-install-plantuml.sh b/jjb/doc/doc-install-plantuml.sh
deleted file mode 100644 (file)
index 0f5aedd..0000000
--- a/jjb/doc/doc-install-plantuml.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-set -x
-if [ ! -d /usr/share/plantuml ]
-       then
-       sudo mkdir -p /usr/share/plantuml
-       cd /usr/share/plantuml
-       sudo wget https://nexus.onap.org/service/local/repositories/central/content/net/sourceforge/plantuml/plantuml/8059/plantuml-8059.jar
-       sudo mv plantuml-8059.jar plantuml.jar
-       fi
-
-if [ ! -f /usr/bin/plantuml ]
-       then
-       sudo touch /usr/bin/plantuml
-       sudo chmod +w /usr/bin/plantuml
-       echo "#!/bin/bash" > /tmp/x.$$
-       echo "java -jar /usr/share/plantuml/plantuml.jar \$@"  >> /tmp/x.$$
-       sudo cp /tmp/x.$$ /usr/bin/plantuml
-       sudo chmod +x /usr/bin/plantuml
-       fi

diff --git a/jjb/doc/doc-post-rtd.sh b/jjb/doc/doc-post-rtd.sh
deleted file mode 100644 (file)
index 78b8d0b..0000000
--- a/jjb/doc/doc-post-rtd.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-if [ "$GERRIT_BRANCH" == "master" ]; then
-    RTD_BUILD_VERSION=latest
-else
-    RTD_BUILD_VERSION="${{GERRIT_BRANCH/\//-}}"
-fi
-
-# shellcheck disable=SC1083
-curl -X POST \
-    -d "branches=$RTD_BUILD_VERSION" \
-    -d "token=$DOCS_RTD_TOKEN"  \
-    https://readthedocs.org/api/v2/webhook/{rtdproject}

diff --git a/jjb/doc/doc-templates-rtd.yaml b/jjb/doc/doc-templates-rtd.yaml
deleted file mode 100644 (file)
index d4e5424..0000000
--- a/jjb/doc/doc-templates-rtd.yaml
+++ /dev/null
@@ -1,162 +0,0 @@
----
-- job-template:
-    # Job template for verifying Sphinx/Restructured Text for RTD
-    #
-    # The purpose of this job template is verify documentation source
-    #
-    # Required Variables:
-    #     branch:        git branch
-    # Optional Variables:
-    #     path:      directory containing the project's tox.ini relative to
-    #                the workspace. The default is the project root.
-
-    name: '{project-name}-{stream}-verify-rtd'
-    path: '$WORKSPACE'
-
-    project-type: freestyle
-    concurrent: true
-    node: '{build-node}'
-
-    properties:
-      - infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-
-    parameters:
-      - infra-parameters:
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
-      - maven-exec:
-          maven-version: '{maven-version}'
-
-    scm:
-      - git:
-          credentials-id: '{jenkins-ssh-credential}'
-          url: '$GIT_BASE'
-          refspec: ''
-          choosing-strategy: 'default'
-          branches:
-            - 'refs/heads/{branch}'
-          skip-tag: true
-          wipe-workspace: true
-          submodule:
-            recursive: '{submodule-recursive}'
-            timeout: '24'
-
-    wrappers:
-      - infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    triggers:
-      - gerrit-trigger-patch-submitted:
-          server: '{server-name}'
-          project: '**'
-          branch: '{branch}'
-          files: 'docs/**/*.rst'
-      - timed: 'H H * * *'
-
-    builders:
-      - shell: |
-          if [ "$GERRIT_PROJECT" != "doc" ]; then
-              if [ -d docs/submodules/$GERRIT_PROJECT.git ]; then
-                  cd docs/submodules/$GERRIT_PROJECT.git
-              else
-                  cd docs/submodules/$GERRIT_PROJECT
-              fi
-              git fetch origin $GERRIT_REFSPEC && git checkout FETCH_HEAD
-          else
-              git fetch origin $GERRIT_REFSPEC && git checkout FETCH_HEAD
-          fi
-      - shell: !include-raw: doc-install-plantuml.sh
-      - shell: |
-          #!/bin/bash
-          python3 -m venv $WORKSPACE/venv-tox
-          source $WORKSPACE/venv-tox/bin/activate
-          pip install --upgrade pip
-          pip install --upgrade tox argparse
-          pip freeze
-          cd $WORKSPACE/{path}
-          tox
-          mkdir -p "$WORKSPACE/archives"
-          mv  docs/_build/html "$WORKSPACE/archives/"
-
-    publishers:
-      - lf-infra-publish
-
-- job-template:
-    # Job template for merging/publishing Sphinx/Restructured Text at RTD
-    #
-    # The purpose of this job template is to trigger updates after
-    # a merge of documentation source in gerrit
-    #
-    # Required Variables:
-    #     branch:        git branch
-    #     rtdproject:    name of a project at readthedocs.io
-    # Optional Variables:
-    #     path:      directory containing the project's tox.ini relative to
-    #                the workspace. The default is the project root.
-
-    name: '{project-name}-{stream}-merge-rtd'
-    path: '$WORKSPACE'
-
-    project-type: freestyle
-    concurrent: false
-    node: '{build-node}'
-
-    properties:
-      - infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-
-    parameters:
-      - infra-parameters:
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
-      - maven-exec:
-          maven-version: '{maven-version}'
-
-    scm:
-      - git:
-          credentials-id: '{jenkins-ssh-credential}'
-          url: '$GIT_BASE'
-          refspec: ''
-          choosing-strategy: 'default'
-          branches:
-            - 'refs/heads/{branch}'
-          skip-tag: true
-          wipe-workspace: true
-          submodule-recursive: '{submodule-recursive}'
-
-
-    wrappers:
-      - infra-wrappers:
-          build-timeout: '{build-timeout}'
-      - credentials-binding:
-          - text:
-             credential-id: docs-token
-             variable: DOCS_RTD_TOKEN
-
-    triggers:
-      - gerrit:
-          server-name: '{server-name}'
-          trigger-on:
-            - change-merged-event
-            - comment-added-contains-event:
-                comment-contains-value: 'remerge'
-          projects:
-            - project-compare-type: 'ANT'
-              project-pattern: '**'
-              branches:
-                - branch-compare-type: 'ANT'
-                  branch-pattern: '**/{branch}'
-              file-paths:
-                - compare-type: ANT
-                  pattern: docs/**/*.rst
-
-    builders:
-      - shell: !include-raw: doc-post-rtd.sh
-
-    publishers:
-      - lf-infra-publish

diff --git a/jjb/doc/doc.yaml b/jjb/doc/doc.yaml
index f9f2cf2..ad3cea7 100644 (file)
--- a/jjb/doc/doc.yaml
+++ b/jjb/doc/doc.yaml
@@ -5,22 +5,6 @@
     views:
       - project-view
 
-- project:
-    name: doc
-    project-name: 'doc'
-    python-version: python3
-    jobs:
-      - '{project-name}-{stream}-verify-rtd':
-          build-node: centos7-docker-8c-8g
-      - '{project-name}-{stream}-merge-rtd'
-
-    project: 'doc'
-    rtdproject: 'onap/58810/'
-    mvn-settings: 'doc-settings'
-    stream:
-      - frankfurt:
-          branch: 'frankfurt'
-
 - project:
     name: doc-info
     project-name: doc

diff --git a/jjb/rtdv3/rtdv3.yaml b/jjb/rtdv3/rtdv3.yaml
index a4cec83..4a5d8ea 100644 (file)
--- a/jjb/rtdv3/rtdv3.yaml
+++ b/jjb/rtdv3/rtdv3.yaml
@@ -17,11 +17,20 @@
     tox-dir: "docs/"
     doc-dir: "_build/html"
     build-node: centos7-builder-2c-1g
+    # override the default to allow rechecking a patchset
+    gerrit_verify_triggers:
+      - patchset-created-event:
+          exclude-drafts: true
+          exclude-trivial-rebase: false
+          exclude-no-code-change: false
+      - draft-published-event
+      - comment-added-contains-event:
+          comment-contains-value: "(recheck|reverify)"
     # override the default to ignore ref-updated-event (tag)
     gerrit_merge_triggers:
       - change-merged-event
       - comment-added-contains-event:
-          comment-contains-value: remerge$
+          comment-contains-value: "remerge"
     jobs:
       - rtdv3-global-verify
       - rtdv3-global-merge:
@@ -29,3 +38,5 @@
     stream:
       - master:
           branch: '*'
+      - istanbul:
+          branch: 'istanbul'

diff --git a/jjb/sdnc/sdnc-apps.yaml b/jjb/sdnc/sdnc-apps.yaml
index f7c7d69..efa64ec 100644 (file)
--- a/jjb/sdnc/sdnc-apps.yaml
+++ b/jjb/sdnc/sdnc-apps.yaml
@@ -38,6 +38,8 @@
           branch: 'master'
       - 'istanbul':
           branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
     java-version: openjdk11
     mvn-version : "mvn36"
     mvn-settings: 'sdnc-apps-settings'
@@ -106,6 +108,8 @@
           branch: 'master'
       - 'istanbul':
           branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
     java-version: openjdk11
     mvn-version : "mvn36"
     mvn-settings: 'sdnc-apps-settings'

diff --git a/jjb/sdnc/sdnc-csit.yaml b/jjb/sdnc/sdnc-csit.yaml
index 4c16882..989853f 100644 (file)
--- a/jjb/sdnc/sdnc-csit.yaml
+++ b/jjb/sdnc/sdnc-csit.yaml
@@ -17,6 +17,8 @@
           branch: 'master'
       - 'istanbul':
           branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
     mvn-settings: 'sdnc-oam-settings'
     robot-options: ''
     branch: 'master'

diff --git a/jjb/sdnc/sdnc-northbound.yaml b/jjb/sdnc/sdnc-northbound.yaml
index 9447158..0da9c8c 100644 (file)
--- a/jjb/sdnc/sdnc-northbound.yaml
+++ b/jjb/sdnc/sdnc-northbound.yaml
@@ -19,6 +19,8 @@
           branch: 'master'
       - 'istanbul':
           branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
     java-version: openjdk11
     mvn-version: "mvn36"
     mvn-settings: 'sdnc-northbound-settings'
@@ -68,6 +70,8 @@
           branch: 'master'
       - 'istanbul':
           branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
     mvn-settings: 'sdnc-northbound-settings'
     java-version: openjdk11
     mvn-version: 'mvn36'

diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml
index 4775d7d..f38b1de 100644 (file)
--- a/jjb/sdnc/sdnc-oam.yaml
+++ b/jjb/sdnc/sdnc-oam.yaml
@@ -28,6 +28,8 @@
           branch: 'master'
       - 'istanbul':
           branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
     java-version: openjdk11
     mvn-version: "mvn36"
     mvn-settings: 'sdnc-oam-settings'
@@ -69,6 +71,8 @@
           branch: 'master'
       - 'istanbul':
           branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
     mvn-settings: 'sdnc-oam-settings'
     java-version: openjdk11
     mvn-version: 'mvn36'