Enable upload of vpp & hicn verify docs to s3 7day retention bucket
[ci-management.git] / jjb / vpp / docs.yaml
index 7c1b61f..e61c0a6 100644 (file)
@@ -2,70 +2,49 @@
 - project:
     name: docs
     jobs:
-      - 'vpp-docs-merge-{stream}'
-      - 'vpp-docs-verify-{stream}'
-      - 'vpp-make-test-docs-merge-{stream}'
-      - 'vpp-make-test-docs-verify-{stream}'
+      - 'vpp-docs-merge-{stream}-{os}-{executor-arch}'
+      - 'vpp-docs-verify-{stream}-{os}-{executor-arch}'
 
     project: 'vpp'
+    executor-arch: 'x86_64'
     os:
-      - ubuntu1804:
-          repo-os-part: 'ubuntu.bionic.main'
-
+      - 'ubuntu2004'
+      - 'ubuntu2204'
     stream:
-      - master:
+      - 'master':
           branch: 'master'
-          repo-stream-part: 'master'
-      - '1901':
-          branch: 'stable/1901'
-          repo-stream-part: 'stable.1901'
-      - '1904':
-          branch: 'stable/1904'
-          repo-stream-part: 'stable.1904'
-      - '1908':
-          branch: 'stable/1908'
-          repo-stream-part: 'stable.1908'
-
-    type:
-      - short
-      - long
-
-- project:
-    name: sphinx
-    jobs:
-      - 'vpp-sphinx-docs-merge-{stream}'
-      - 'vpp-sphinx-docs-verify-{stream}'
-
-    project: 'vpp'
-    os:
-      - ubuntu1804:
-          repo-os-part: 'ubuntu.bionic.main'
-
-    stream:
-      - master:
-          branch: 'master'
-          repo-stream-part: 'master'
-    type:
-      - short
-      - long
+          branch-refspec: ''
+      - '2206':
+          branch: 'stable/2206'
+          branch-refspec: ''
+      - '2210':
+          branch: 'stable/2210'
+          branch-refspec: ''
+    exclude:
+      # os deprecated in 22.10
+      - stream: '2210'
+        os: 'ubuntu2004'
+      # os deprecated in master
+      - stream: 'master'
+        os: 'ubuntu2004'
+      # os added in 22.10
+      - stream: '2206'
+        os: 'ubuntu2204'
 
 - job-template:
-    name: 'vpp-docs-verify-{stream}'
+    name: 'vpp-docs-verify-{stream}-{os}-{executor-arch}'
 
     project-type: freestyle
-    node: ubuntu1804-us
+    node: 'builder-{os}-prod-{executor-arch}'
     concurrent: 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:
       - gerrit-parameter:
           branch: '{branch}'
       - os-parameter:
-          os: 'ubuntu1804'
-      - maven-exec:
-          maven-version: 'mvn33-new'
+          os: '{os}'
       - stream-parameter:
           stream: '{stream}'
+      - gerrit-refspec-parameter:
+          refspec: '{branch-refspec}'
 
     scm:
       - gerrit-trigger-scm:
           branch: '{branch}'
 
     builders:
-      - maven-target:
-          maven-version: 'mvn33-new'
-          goals: '--version'
-          settings: 'vpp-settings'
-          settings-type: cfp
-          global-settings: 'global-settings'
-          global-settings-type: cfp
-      - provide-maven-settings:
-          settings-file: 'vpp-settings'
-          global-settings-file: 'global-settings'
-      - shell:
-          !include-raw-escape: ../scripts/setup_vpp_ubuntu_docker_test.sh
-      - shell:
-          !include-raw-escape: include-raw-vpp-docs.sh
-
-    publishers:
-      - lf-infra-publish
-      - naginator:
-          rerun-unstable-builds: false
-          max-failed-builds: 1
-          fixed-delay: 90
-
-- job-template:
-    name: 'vpp-docs-merge-{stream}'
-
-    project-type: freestyle
-    node: ubuntu1804-us
-    concurrent: false
-    archive-artifacts: '**/build-root/docs/html/*'
-    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}'
-
-    parameters:
-      - project-parameter:
-          project: '{project}'
-      - gerrit-parameter:
-          branch: '{branch}'
-      - os-parameter:
-          os: 'ubuntu1804'
-      - maven-exec:
-          maven-version: 'mvn33-new'
-      - stream-parameter:
-          stream: '{stream}'
-      - string:
-          name: ARCHIVE_ARTIFACTS
-          description: Artifacts to archive to the logs server.
-
-    scm:
-      - gerrit-trigger-scm:
-          credentials-id: 'jenkins-gerrit-credentials'
-          refspec: ''
-          choosing-strategy: 'default'
-
-    wrappers:
-      - fdio-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    triggers:
-      - reverse:
-          jobs: 'vpp-merge-{stream}-ubuntu1804'
-          result: 'success'
-      - gerrit:
-          server-name: 'Primary'
-          trigger-on:
-            - comment-added-contains-event:
-                comment-contains-value: 'run-docs'
-          projects:
-            - project-compare-type: 'ANT'
-              project-pattern: '{project}'
-              branches:
-                - branch-compare-type: 'ANT'
-                  branch-pattern: '**/{branch}'
-          skip-vote:
-            successful: true
-            failed: true
-            unstable: true
-            notbuilt: true
-
-    builders:
-      - maven-target:
-          maven-version: 'mvn33-new'
-          goals: '--version'
-          settings: 'vpp-settings'
-          settings-type: cfp
-          global-settings: 'global-settings'
-          global-settings-type: cfp
-      - provide-maven-settings:
-          settings-file: 'vpp-settings'
-          global-settings-file: 'global-settings'
-      - shell:
-          !include-raw-escape: ../scripts/setup_vpp_ubuntu_docker_test.sh
-      - shell:
-          !include-raw-escape: include-raw-vpp-docs.sh
-
-    publishers:
-      - lf-infra-publish
-      - naginator:
-          rerun-unstable-builds: false
-          max-failed-builds: 1
-          fixed-delay: 90
-
-- job-template:
-    name: 'vpp-sphinx-docs-verify-{stream}'
-
-    project-type: freestyle
-    node: ubuntu1804-us
-    concurrent: 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}'
-
-    parameters:
-      - project-parameter:
-          project: '{project}'
-      - gerrit-parameter:
-          branch: '{branch}'
-      - os-parameter:
-          os: 'ubuntu1804'
-      - maven-exec:
-          maven-version: 'mvn33-new'
-      - stream-parameter:
-          stream: '{stream}'
-
-    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:
-          server-name: 'Primary'
-          trigger-on:
-            - comment-added-contains-event:
-                comment-contains-value: 'run-sphinx-docs-verify'
-          projects:
-            - project-compare-type: 'ANT'
-              project-pattern: '{project}'
-              branches:
-                - branch-compare-type: 'ANT'
-                  branch-pattern: '**/{branch}'
-          skip-vote:
-            successful: true
-            failed: true
-            unstable: true
-            notbuilt: true
-    builders:
-      - maven-target:
-          maven-version: 'mvn33-new'
-          goals: '--version'
-          settings: 'vpp-settings'
-          settings-type: cfp
-          global-settings: 'global-settings'
-          global-settings-type: cfp
-      - provide-maven-settings:
-          settings-file: 'vpp-settings'
-          global-settings-file: 'global-settings'
-      - shell:
-          !include-raw-escape: ../scripts/setup_vpp_ubuntu_docker_test.sh
-      - shell:
-          !include-raw-escape: include-raw-vpp-sphinx-docs.sh
-
-    publishers:
-      - lf-infra-publish
-      - naginator:
-          rerun-unstable-builds: false
-          max-failed-builds: 1
-          fixed-delay: 90
-
-- job-template:
-    name: 'vpp-sphinx-docs-merge-{stream}'
-
-    project-type: freestyle
-    node: ubuntu1804-us
-    concurrent: false
-    archive-artifacts: 'docs/_build/html/*'
-    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}'
-
-    parameters:
-      - project-parameter:
-          project: '{project}'
-      - gerrit-parameter:
-          branch: '{branch}'
-      - os-parameter:
-          os: 'ubuntu1804'
-      - maven-exec:
-          maven-version: 'mvn33-new'
-      - stream-parameter:
-          stream: '{stream}'
-      - 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: ''
-          choosing-strategy: 'default'
-
-    wrappers:
-      - fdio-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    triggers:
-      - gerrit:
-          server-name: 'Primary'
-          trigger-on:
-            - comment-added-contains-event:
-                comment-contains-value: 'run-sphinx-docs-merged'
-          skip-vote:
-            successful: true
-            failed: true
-            unstable: true
-            notbuilt: true
-
-    builders:
-      - maven-target:
-          maven-version: 'mvn33-new'
-          goals: '--version'
-          settings: 'vpp-settings'
-          settings-type: cfp
-          global-settings: 'global-settings'
-          global-settings-type: cfp
-      - provide-maven-settings:
-          settings-file: 'vpp-settings'
-          global-settings-file: 'global-settings'
       - shell:
-          !include-raw-escape: ../scripts/setup_vpp_ubuntu_docker_test.sh
+          !include-raw-escape:
+          - ../scripts/setup_executor_env.sh
       - shell:
-          !include-raw-escape: include-raw-vpp-sphinx-docs.sh
-
-    publishers:
-      - lf-infra-publish
-      - naginator:
-          rerun-unstable-builds: false
-          max-failed-builds: 1
-          fixed-delay: 90
-
-- job-template:
-    name: 'vpp-make-test-docs-verify-{stream}'
-
-    project-type: freestyle
-    node: ubuntu1804-us
-    concurrent: 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}'
-
-    parameters:
-      - project-parameter:
-          project: '{project}'
-      - gerrit-parameter:
-          branch: '{branch}'
-      - os-parameter:
-          os: 'ubuntu1804'
-      - maven-exec:
-          maven-version: 'mvn33-new'
-      - stream-parameter:
-          stream: '{stream}'
-
-    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-checkstyle:
-          name: '{project}'
-          branch: '{branch}'
-
-    builders:
-      - maven-target:
-          maven-version: 'mvn33-new'
-          goals: '--version'
-          settings: 'vpp-settings'
-          settings-type: cfp
-          global-settings: 'global-settings'
-          global-settings-type: cfp
-      - provide-maven-settings:
-          settings-file: 'vpp-settings'
-          global-settings-file: 'global-settings'
+          !include-raw-escape:
+          - ../scripts/setup_vpp_ubuntu_docker_test.sh
       - shell:
-          !include-raw-escape: ../scripts/setup_vpp_ubuntu_docker_test.sh
-      - shell:
-          !include-raw-escape: include-raw-vpp-make-test-docs.sh
+          !include-raw-escape:
+          - ../scripts/vpp/docs.sh
 
     publishers:
-      - lf-infra-publish
-      - naginator:
-          rerun-unstable-builds: false
-          max-failed-builds: 1
-          fixed-delay: 90
+      - fdio-infra-publish-docs-7day
+      - fdio-infra-publish
 
 - job-template:
-    name: 'vpp-make-test-docs-merge-{stream}'
+    name: 'vpp-docs-merge-{stream}-{os}-{executor-arch}'
 
     project-type: freestyle
-    node: ubuntu1804-us
+    node: 'builder-{os}-prod-{executor-arch}'
     concurrent: false
-    archive-artifacts: '**/build-root/build-test/doc/html/*'
     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:
       - gerrit-parameter:
           branch: '{branch}'
       - 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.
 
     scm:
       - gerrit-trigger-scm:
 
     triggers:
       - reverse:
-          jobs: 'vpp-merge-{stream}-ubuntu1804'
+          jobs: 'vpp-merge-{stream}-{os}-{executor-arch}'
           result: 'success'
       - gerrit:
           server-name: 'Primary'
             notbuilt: true
 
     builders:
-      - maven-target:
-          maven-version: 'mvn33-new'
-          goals: '--version'
-          settings: 'vpp-settings'
-          settings-type: cfp
-          global-settings: 'global-settings'
-          global-settings-type: cfp
-      - provide-maven-settings:
-          settings-file: 'vpp-settings'
-          global-settings-file: 'global-settings'
       - shell:
-          !include-raw-escape: ../scripts/setup_vpp_ubuntu_docker_test.sh
+          !include-raw-escape:
+          - ../scripts/setup_executor_env.sh
+      - shell:
+          !include-raw-escape:
+          - ../scripts/setup_vpp_ubuntu_docker_test.sh
       - shell:
-          !include-raw-escape: include-raw-vpp-make-test-docs.sh
+          !include-raw-escape:
+          - ../scripts/vpp/docs.sh
 
     publishers:
-      - lf-infra-publish
-      - naginator:
-          rerun-unstable-builds: false
-          max-failed-builds: 1
-          fixed-delay: 90
+      - fdio-infra-publish-docs
+      - fdio-infra-publish