From fc7a9bbeb6c00edc8356d929ff3ef22fd0974db0 Mon Sep 17 00:00:00 2001 From: Andrew Grimberg Date: Wed, 3 May 2023 09:20:21 -0700 Subject: Refactor: Cleanup for pre-commit Change-Id: I424eb8c466dc22347119e9c140ffb562d8089b32 Issue-ID: CIMAN-33 Signed-off-by: Andrew Grimberg --- ...ion-simulators-nf-simulator-netconf-server.yaml | 111 ++++++++++----------- 1 file changed, 55 insertions(+), 56 deletions(-) (limited to 'jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-netconf-server.yaml') 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 8c21bb621..8c0039c51 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,65 +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 + 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: "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-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' + 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-view - project-name: integration-simulators-nf-simulator-netconf-server - views: - - project-view + 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 -- cgit 1.2.3-korg