From 485e5ac4922b0131dfdee4cc5aa96e88bcc2eb63 Mon Sep 17 00:00:00 2001 From: Andrew Grimberg Date: Wed, 3 May 2023 09:08:04 -0700 Subject: Refactor: Cleanup for pre-commit Change-Id: Id20c28def6cf96c13c4869cdeb343d9249327a3e Issue-ID: CIMAN-33 Signed-off-by: Andrew Grimberg --- jjb/sdnc/sdnc-oam.yaml | 74 +++++++++++++++++++------------------------------- 1 file changed, 28 insertions(+), 46 deletions(-) (limited to 'jjb/sdnc/sdnc-oam.yaml') 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 -- cgit 1.2.3-korg