CI: Remove Jenkins gerrit-info-yaml-verify job

[ci-management.git] / jjb / integration / simulators / integration-ran-simulator.yaml

diff --git a/jjb/integration/simulators/integration-ran-simulator.yaml b/jjb/integration/simulators/integration-ran-simulator.yaml
index ff8faf2..b50fff3 100644 (file)
--- a/jjb/integration/simulators/integration-ran-simulator.yaml
+++ b/jjb/integration/simulators/integration-ran-simulator.yaml
@@ -1,40 +1,31 @@
 ---
 - project:
-      name: integration-simulators-ran-simulator
-      project-name: integration-simulators-ran-simulator
-      stream:
-          -   'master':
-                  branch: 'master'
-      project: 'integration/simulators/ran-simulator'
-      mvn-settings: 'integration-simulators-ran-simulator-settings'
-      maven-deploy-properties: |
-          deployAtEnd=true
-      archive-artifacts: ''
-      build-node: ubuntu1804-docker-8c-8g
-      jobs:
-          - '{project-name}-{stream}-verify-java':
-                mvn-goals: 'clean install'
-                pattern: 'ransim/**'
-                pom: 'ransim/pom.xml'
-          - '{project-name}-{stream}-merge-java':
-                mvn-goals: 'clean deploy'
-                pom: 'ransim/pom.xml'
-          -  '{project-name}-gerrit-release-jobs':
-                 build-node: centos7-docker-8c-8g
-          - gerrit-maven-stage:
-                sign-artifacts: true
-                build-node: centos8-docker-8c-8g
-                maven-versions-plugin: true
-                mvn-goals: 'clean deploy'
-
-- project:
-    name: integration-simulators-ran-simulator-info
+    name: integration-simulators-ran-simulator
     project-name: integration-simulators-ran-simulator
+    stream:
+      - "master":
+          branch: "master"
+    project: "integration/simulators/ran-simulator"
+    mvn-settings: "integration-simulators-ran-simulator-settings"
+    maven-deploy-properties: |
+      deployAtEnd=true
+    archive-artifacts: ""
+    build-node: ubuntu1804-docker-8c-8g
     jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos8-builder-2c-1g
-    project: integration/simulators/ran-simulator
-    branch: master
+      - "{project-name}-{stream}-verify-java":
+          mvn-goals: "clean install"
+          pattern: "ransim/**"
+          pom: "ransim/pom.xml"
+      - "{project-name}-{stream}-merge-java":
+          mvn-goals: "clean deploy"
+          pom: "ransim/pom.xml"
+      - "{project-name}-gerrit-release-jobs":
+          build-node: centos7-docker-2c-1g
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos8-docker-8c-8g
+          maven-versions-plugin: true
+          mvn-goals: "clean deploy"
 
 - project:
     name: integration-simulators-ran-simulator-linters
@@ -44,18 +35,18 @@
     jobs:
       - integration-linters
     subproject:
-      - 'yaml':
-          tox-dir: '.'
-          tox-envs: 'yaml'
-          pattern: '**/*.yaml'
-      - 'yml':
-          tox-dir: '.'
-          tox-envs: 'yaml'
-          pattern: '**/*.yml'
-      - 'json':
-          tox-dir: '.'
-          tox-envs: 'json'
-          pattern: '**/*.json'
+      - "yaml":
+          tox-dir: "."
+          tox-envs: "yaml"
+          pattern: "**/*.yaml"
+      - "yml":
+          tox-dir: "."
+          tox-envs: "yaml"
+          pattern: "**/*.yml"
+      - "json":
+          tox-dir: "."
+          tox-envs: "json"
+          pattern: "**/*.json"
     stream:
-      - 'master':
-          branch: 'master'
+      - "master":
+          branch: "master"