feat(tldk): enable verify jobs in sandbox

[ci-management.git] / jjb / tldk / tldk.yaml

diff --git a/jjb/tldk/tldk.yaml b/jjb/tldk/tldk.yaml
index 4fd10a0..f20eadc 100644 (file)
--- a/jjb/tldk/tldk.yaml
+++ b/jjb/tldk/tldk.yaml
@@ -18,16 +18,17 @@
       - '{project}-verify-{stream}-{os}'
       - '{project}-merge-{stream}-{os}'
       - '{project}-verify-image-{stream}-{os}'
-      - 'tldk-csit-verify-func-{stream}-{os}-virl'
 
     project: 'tldk'
     os:
-      - ubuntu1604
+      - ubuntu2004
     stream:
       - master:
           branch: 'master'
       - dev-next-socket:
           branch: 'dev-next-socket'
+      - dev-mitm-proxy:
+          branch: 'dev-mitm-proxy'
 
 - project:
     name: tldk-view
@@ -42,11 +43,9 @@
     node: '{os}-builder-4c-4g'
     concurrent: true
 
-    build-discarder:
-      daysToKeep: '{build-days-to-keep}'
-      numToKeep: '{build-num-to-keep}'
-      artifactDaysToKeep: '{build-artifact-days-to-keep}'
-      artifactNumToKeep: '{build-artifact-num-to-keep}'
+    properties:
+      - lf-infra-properties:
+          build-days-to-keep: "{build-days-to-keep}"
 
     parameters:
       - project-parameter:
@@ -55,6 +54,7 @@
           branch: '{branch}'
       - os-parameter:
           os: '{os}'
+      - gerrit-refspec-parameter
 
     scm:
       - gerrit-trigger-scm:
@@ -80,8 +80,7 @@
           !include-raw-escape: include-raw-build.sh
 
     publishers:
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn36'
+      - lf-infra-publish
 
 - job-template:
     name: '{project}-verify-image-{stream}-{os}'
@@ -90,11 +89,9 @@
     node: '{os}-builder-4c-4g'
     concurrent: true
 
-    build-discarder:
-      daysToKeep: '{build-days-to-keep}'
-      numToKeep: '{build-num-to-keep}'
-      artifactDaysToKeep: '{build-artifact-days-to-keep}'
-      artifactNumToKeep: '{build-artifact-num-to-keep}'
+    properties:
+      - lf-infra-properties:
+          build-days-to-keep: "{build-days-to-keep}"
 
     parameters:
       - project-parameter:
@@ -103,6 +100,7 @@
           branch: '{branch}'
       - os-parameter:
           os: '{os}'
+      - gerrit-refspec-parameter
 
     scm:
       - gerrit-trigger-scm:
@@ -141,19 +139,16 @@
           !include-raw-escape: include-raw-build.sh
 
     publishers:
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn36'
+      - lf-infra-publish
 
 - job-template:
     name: '{project}-merge-{stream}-{os}'
 
     project-type: freestyle
     node: '{os}-builder-4c-4g'
-    build-discarder:
-      daysToKeep: '{build-days-to-keep}'
-      numToKeep: '{build-num-to-keep}'
-      artifactDaysToKeep: '{build-artifact-days-to-keep}'
-      artifactNumToKeep: '{build-artifact-num-to-keep}'
+    properties:
+      - lf-infra-properties:
+          build-days-to-keep: "{build-days-to-keep}"
 
     parameters:
       - project-parameter:
@@ -187,69 +182,14 @@
           !include-raw-escape: include-raw-build.sh
 
     publishers:
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn36'
-
-- job-template:
-    name: 'tldk-csit-verify-func-{stream}-{os}-virl'
-
-    project-type: freestyle
-    node: '{os}-builder-4c-4g'
-    concurrent: true
-    archive-artifacts: >
-      **/csit/report.html
-      **/csit/log.html
-      **/csit/output.xml
-    latest-only: false
-
-    build-discarder:
-      daysToKeep: '{build-days-to-keep}'
-      numToKeep: '{build-num-to-keep}'
-      artifactDaysToKeep: '{build-artifact-days-to-keep}'
-      artifactNumToKeep: '{build-artifact-num-to-keep}'
-
-    parameters:
-      - project-parameter:
-          project: '{project}'
-      - gerrit-parameter:
-          branch: '{branch}'
-      - string:
-          name: ARCHIVE_ARTIFACTS
-          default: '{archive-artifacts}'
-          description: Artifacts to archive to the logs server.
-
-    scm:
-      - gerrit-trigger-scm:
-          credentials-id: 'jenkins-gerrit-credentials'
-          refspec: '$GERRIT_REFSPEC'
-          choosing-strategy: 'gerrit'
-
-    wrappers:
-      - fdio-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    triggers:
-      - gerrit-trigger-manually-triggered:
-          name: '{project}'
-          branch: '{branch}'
-          comment-trigger-value: 'verify-tldk-func'
-
-    builders:
-      - shell:
-          !include-raw-escape: include-raw-tldk-csit-functional-virl.sh
-
-    publishers:
-      - robot-report:
-          output-path: ''
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn36'
+      - lf-infra-publish
 
 - project:
     name: tldk-info
     project-name: tldk
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-4c-4g
+    build-node: centos7-builder-2c-2g
     project: tldk
     branch: master
 
@@ -263,6 +203,6 @@
     sonarcloud-api-token: '{sonarcloud_api_token}'
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     branch: master
-    build-node: centos7-docker-4c-4g
+    build-node: centos7-docker-2c-2g
     jobs:
       - gerrit-maven-sonar