X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fhicn%2Fhicn-docs.yaml;h=27bdbe93eeb8df912454bdd94f43c64f951d509d;hb=9336e2d1f5678dda74d5740418e616fe5837609e;hp=eec3533f543949dfe14bbb64e1fb02731a2b4514;hpb=9968d10fd9aa0c68f1f8d5f7732a615015be41b5;p=ci-management.git

diff --git a/jjb/hicn/hicn-docs.yaml b/jjb/hicn/hicn-docs.yaml
index eec3533f5..27bdbe93e 100644
--- a/jjb/hicn/hicn-docs.yaml
+++ b/jjb/hicn/hicn-docs.yaml
@@ -2,156 +2,122 @@
 - project:
     name: hicn-docs
     jobs:
-      - 'hicn-docs-merge-{stream}'
-      - 'hicn-docs-verify-{stream}'
-
-    project: 'hicn'
-    os:
-      - ubuntu1804:
-          repo-os-part: 'ubuntu.bionic.main'
+      - "hicn-docs-verify-{stream}-{os}-{executor-arch}"
+      - "hicn-docs-merge-{stream}-{os}-{executor-arch}"
 
+    project: "hicn"
+    os: ubuntu2004
+    executor-arch: "x86_64"
     stream:
-      - master:
-          branch: 'master'
-          repo-stream-part: 'master'
+      - "master":
+          branch: "master"
+          branch-refspec: ""
     type:
       - short
       - long
 
 - job-template:
-    name: 'hicn-docs-verify-{stream}'
+    name: "hicn-docs-verify-{stream}-{os}-{executor-arch}"
 
     project-type: freestyle
-    node: ubuntu1804-us
+    node: "builder-{os}-prod-{executor-arch}"
     concurrent: true
-    archive-artifacts:
-      - '**/build-doxygen/lib/doc/html/*'
-      - '**/docs/build/html'
-    allow-empty: 'true'
+    allow-empty: "true"
     fingerprint: false
     only-if-success: true
     default-excludes: 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}'
+    properties:
+      - lf-infra-properties:
+          build-days-to-keep: "{build-days-to-keep}"
 
     parameters:
       - project-parameter:
-          project: '{project}'
+          project: "{project}"
       - gerrit-parameter:
-          branch: '{branch}'
+          branch: "{branch}"
+      - gerrit-refspec-parameter:
+          refspec: "{branch-refspec}"
       - os-parameter:
-          os: 'ubuntu1804'
-      - maven-exec:
-          maven-version: 'mvn33-new'
+          os: "{os}"
       - stream-parameter:
-          stream: '{stream}'
-      - string:
-          name: ARCHIVE_ARTIFACTS
-          default: '{archive-artifacts}'
-          description: Artifacts to archive to the logs server.
+          stream: "{stream}"
 
     scm:
       - gerrit-trigger-scm:
-          credentials-id: 'jenkins-gerrit-credentials'
-          refspec: '$GERRIT_REFSPEC'
-          choosing-strategy: 'gerrit'
+          credentials-id: "jenkins-gerrit-credentials"
+          refspec: "$GERRIT_REFSPEC"
+          choosing-strategy: "gerrit"
 
     wrappers:
       - fdio-infra-wrappers:
-          build-timeout: '{build-timeout}'
+          build-timeout: "{build-timeout}"
 
     triggers:
-      - gerrit-trigger-checkstyle:
-          name: '{project}'
-          branch: '{branch}'
+      - gerrit-trigger-checkstyle-nonvoting:
+          name: "{project}"
+          branch: "{branch}"
 
     builders:
-      - maven-target:
-          maven-version: 'mvn33-new'
-          goals: '--version'
-          settings: 'hicn-settings'
-          settings-type: cfp
-          global-settings: 'global-settings'
-          global-settings-type: cfp
-      - provide-maven-settings:
-          settings-file: 'hicn-settings'
-          global-settings-file: 'global-settings'
-      - shell:
-          !include-raw-escape: include-raw-hicn-docs.sh
+      - shell: !include-raw-escape: ../scripts/setup_executor_env.sh
+      - shell: !include-raw-escape: ../scripts/hicn/docs.sh
 
     publishers:
-      - fdio-infra-shiplogs:
-            maven-version: 'mvn36'
-      - naginator:
-          rerun-unstable-builds: false
-          max-failed-builds: 1
-          fixed-delay: 90
+      - fdio-infra-publish-docs-7day
+      - fdio-infra-publish
 
 - job-template:
-    name: 'hicn-docs-merge-{stream}'
+    name: "hicn-docs-merge-{stream}-{os}-{executor-arch}"
 
     project-type: freestyle
-    node: ubuntu1804-us
+    node: "builder-{os}-prod-{executor-arch}"
     concurrent: false
-    archive-artifacts:
-      - '**/build-doxygen/lib/doc/html/*'
-      - '**/docs/build/html'
-    allow-empty: 'true'
+    allow-empty: "true"
     fingerprint: false
     only-if-success: true
     default-excludes: 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}'
+    properties:
+      - lf-infra-properties:
+          build-days-to-keep: "{build-days-to-keep}"
 
     parameters:
       - project-parameter:
-          project: '{project}'
+          project: "{project}"
       - gerrit-parameter:
-          branch: '{branch}'
+          branch: "{branch}"
+      - gerrit-refspec-parameter:
+          refspec: "{branch-refspec}"
       - os-parameter:
-          os: 'ubuntu1804'
-      - maven-exec:
-          maven-version: 'mvn33-new'
+          os: "{os}"
       - stream-parameter:
-          stream: '{stream}'
-      - string:
-          name: ARCHIVE_ARTIFACTS
-          default: '{archive-artifacts}'
-          description: Artifacts to archive to the logs server.
+          stream: "{stream}"
 
     scm:
       - gerrit-trigger-scm:
-          credentials-id: 'jenkins-gerrit-credentials'
-          refspec: ''
-          choosing-strategy: 'default'
+          credentials-id: "jenkins-gerrit-credentials"
+          refspec: ""
+          choosing-strategy: "default"
 
     wrappers:
       - fdio-infra-wrappers:
-          build-timeout: '{build-timeout}'
+          build-timeout: "{build-timeout}"
 
     triggers:
       - reverse:
-          jobs: 'hicn-merge-{stream}-ubuntu1804'
-          result: 'success'
+          jobs: "hicn-merge-{stream}-{os}-{executor-arch}"
+          result: "success"
       - gerrit:
-          server-name: 'Primary'
+          server-name: "Primary"
           trigger-on:
             - comment-added-contains-event:
-                comment-contains-value: 'run-docs'
+                comment-contains-value: "run-docs"
           projects:
-            - project-compare-type: 'ANT'
-              project-pattern: '{project}'
+            - project-compare-type: "ANT"
+              project-pattern: "{project}"
               branches:
-                - branch-compare-type: 'ANT'
-                  branch-pattern: '**/{branch}'
+                - branch-compare-type: "ANT"
+                  branch-pattern: "**/{branch}"
           skip-vote:
             successful: true
             failed: true
@@ -159,23 +125,9 @@
             notbuilt: true
 
     builders:
-      - maven-target:
-          maven-version: 'mvn33-new'
-          goals: '--version'
-          settings: 'hicn-settings'
-          settings-type: cfp
-          global-settings: 'global-settings'
-          global-settings-type: cfp
-      - provide-maven-settings:
-          settings-file: 'hicn-settings'
-          global-settings-file: 'global-settings'
-      - shell:
-          !include-raw-escape: include-raw-hicn-docs.sh
+      - shell: !include-raw-escape: ../scripts/setup_executor_env.sh
+      - shell: !include-raw-escape: ../scripts/hicn/docs.sh
 
     publishers:
-      - fdio-infra-shiplogs:
-            maven-version: 'mvn36'
-      - naginator:
-          rerun-unstable-builds: false
-          max-failed-builds: 1
-          fixed-delay: 90
+      - fdio-infra-publish-docs
+      - fdio-infra-publish