summaryrefslogtreecommitdiffstats
path: root/jjb/oom-platform-cert-service
diff options
context:
space:
mode:
authorAndrew Grimberg <agrimberg@linuxfoundation.org>2023-05-03 09:15:50 -0700
committerAndrew Grimberg <agrimberg@linuxfoundation.org>2023-05-03 09:45:45 -0700
commit02923abe1f578a4b9320d874a282c26841f17266 (patch)
treea2aec9f5cfce55d7e6ec28858e5b27da357c4580 /jjb/oom-platform-cert-service
parented5cccdfd16ffd2993c0f5363a1290e0f14ad8c3 (diff)
Refactor: Cleanup for pre-commit
Change-Id: I939d6f003864abb1b09c2e040d1f30558806cff3 Issue-ID: CIMAN-33 Signed-off-by: Andrew Grimberg <agrimberg@linuxfoundation.org>
Diffstat (limited to 'jjb/oom-platform-cert-service')
-rw-r--r--jjb/oom-platform-cert-service/oom-platform-cert-service-csit.yaml33
-rw-r--r--jjb/oom-platform-cert-service/oom-platform-cert-service.yaml128
2 files changed, 81 insertions, 80 deletions
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 c5845525f..46b1099be 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,18 +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"
- - "kohn":
- branch: "kohn"
- 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 81ffecbb4..540746a74 100644
--- a/jjb/oom-platform-cert-service/oom-platform-cert-service.yaml
+++ b/jjb/oom-platform-cert-service/oom-platform-cert-service.yaml
@@ -14,71 +14,71 @@
- gerrit-info-yaml-verify
- project:
- 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'
+ 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-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"