diff options
| -rw-r--r-- | jjb/sdnc/sdnc-apps.yaml | 102 | ||||
| -rw-r--r-- | jjb/sdnc/sdnc-csit.yaml | 30 | ||||
| -rw-r--r-- | jjb/sdnc/sdnc-northbound.yaml | 62 | ||||
| -rw-r--r-- | jjb/sdnc/sdnc-oam.yaml | 74 |
4 files changed, 116 insertions, 152 deletions
diff --git a/jjb/sdnc/sdnc-apps.yaml b/jjb/sdnc/sdnc-apps.yaml index f2d990ca5..e491ac7ad 100644 --- a/jjb/sdnc/sdnc-apps.yaml +++ b/jjb/sdnc/sdnc-apps.yaml @@ -7,108 +7,90 @@ - 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: centos8-docker-8c-8g sign-artifacts: true - mvn-params: '-Dmaven.test.skip=true' - cron: '' + 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': + cron: "@daily" + - "{project-name}-gerrit-release-jobs": build-node: centos7-docker-2c-1g - project: 'sdnc/apps' + project: "sdnc/apps" stream: - - 'master': - branch: 'master' + - "master": + branch: "master" java-version: openjdk17 - - 'kohn': - branch: 'kohn' + - "kohn": + branch: "kohn" java-version: openjdk11 - mvn-version : "mvn38" - mvn-settings: 'sdnc-apps-settings' + 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-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' + 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' + 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' + - "master": + branch: "master" java-version: openjdk17 - mvn-version : "mvn38" - mvn-settings: 'sdnc-apps-settings' - mvn-opts: '--add-opens=java.base/java.util=ALL-UNNAMED' + mvn-version: "mvn38" + mvn-settings: "sdnc-apps-settings" + mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED" - project: name: sdnc-apps-info diff --git a/jjb/sdnc/sdnc-csit.yaml b/jjb/sdnc/sdnc-csit.yaml index 582fee02b..5575d8d3f 100644 --- a/jjb/sdnc/sdnc-csit.yaml +++ b/jjb/sdnc/sdnc-csit.yaml @@ -2,22 +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' - - '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 3472965e4..64009ddd3 100644 --- a/jjb/sdnc/sdnc-northbound.yaml +++ b/jjb/sdnc/sdnc-northbound.yaml @@ -1,76 +1,76 @@ --- - 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: centos8-docker-8c-8g - cron: '' + cron: "" sbom-generator: true - - '{project-name}-gerrit-release-jobs': + - "{project-name}-gerrit-release-jobs": build-node: centos7-docker-2c-1g - project: 'sdnc/northbound' + project: "sdnc/northbound" stream: - - 'master': - branch: 'master' + - "master": + branch: "master" java-version: openjdk17 - - 'kohn': - branch: 'kohn' + - "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-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' + 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' + 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' + - "master": + branch: "master" + mvn-settings: "sdnc-northbound-settings" java-version: openjdk17 - mvn-version: 'mvn38' - mvn-opts: '--add-opens=java.base/java.util=ALL-UNNAMED' + mvn-version: "mvn38" + mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED" - project: name: sdnc-northbound-info diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml index 635d28442..fd6de22ac 100644 --- a/jjb/sdnc/sdnc-oam.yaml +++ b/jjb/sdnc/sdnc-oam.yaml @@ -1,78 +1,60 @@ --- - 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: centos8-docker-8c-8g sign-artifacts: true - mvn-params: '-Dmaven.test.skip=true' - cron: '' + 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' + 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': + cron: "@daily" + - "{project-name}-gerrit-release-jobs": build-node: centos7-docker-2c-1g - project: 'sdnc/oam' + project: "sdnc/oam" stream: - - 'master': - branch: 'master' + - "master": + branch: "master" java-version: openjdk17 - - 'kohn': - branch: 'kohn' + - "kohn": + branch: "kohn" java-version: openjdk11 mvn-version: "mvn38" - mvn-settings: 'sdnc-oam-settings' - files: '**' - archive-artifacts: '' + mvn-settings: "sdnc-oam-settings" + files: "**" + archive-artifacts: "" build-node: ubuntu1804-builder-4c-4g 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' + project-name: "sdnc-oam" build-node: ubuntu1804-builder-4c-4g stream: - - 'master': - branch: 'master' - mvn-settings: 'sdnc-oam-settings' + - "master": + branch: "master" + mvn-settings: "sdnc-oam-settings" java-version: openjdk17 - mvn-version: 'mvn38' - mvn-opts: '--add-opens=java.base/java.util=ALL-UNNAMED' + mvn-version: "mvn38" + mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED" - project: name: sdnc-oam-info |