X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fglobal-macros.yaml;h=2de57c7263e930cef970b8c855432bf93815320e;hb=HEAD;hp=c2c24ca13315745274b32845147b7487b77bfe19;hpb=ac432be7637531f05bc2ead585b4e9bb124b6cb9;p=ci-management.git

diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml
index c2c24ca13..2de57c726 100644
--- a/jjb/global-macros.yaml
+++ b/jjb/global-macros.yaml
@@ -368,6 +368,27 @@
             unstable: '{skip-vote}'
             notbuilt: '{skip-vote}'
 
+- trigger:
+    name: gerrit-trigger-csit-terraform
+    # Manual trigger common for csit-terraform jobs.
+    triggers:
+      - gerrit:
+          server-name: 'Primary'
+          trigger-on:
+            - comment-added-contains-event:
+                comment-contains-value: '{trigger-word}'
+          projects:
+            - project-compare-type: 'ANT'
+              project-pattern: '{project}'
+              branches:
+                - branch-compare-type: 'ANT'
+                  branch-pattern: '**/{branch}'
+          skip-vote:
+            successful: '{skip-vote}'
+            failed: '{skip-vote}'
+            unstable: '{skip-vote}'
+            notbuilt: '{skip-vote}'
+
 - trigger:
     name: gerrit-trigger-csit-vpp-devicetest-full
     # Comes from CSIT, for automatic jobs running device tests with VPP builds.
@@ -754,10 +775,10 @@
 
 - publisher:
     name: fdio-infra-publish-docs
-    # macro to finish up a build.
+    # macro to finish up a docs build.
     #
     # Handles the following:
-    #   - Shipping docs S3 logs repository
+    #   - Mapping docs S3 bucket credentials for merge job docs upload
     #   - Cleanup workspace
     publishers:
       - postbuildscript:
@@ -779,6 +800,60 @@
             - "**/*.jenkins-trigger"
           fail-build: false
 
+- publisher:
+    name: fdio-infra-publish-cov-7day
+    # macro to finish up a verify docs build.
+    #
+    # Handles the following:
+    #   - Mapping 7-day retention S3 bucket credentials for verify job docs upload
+    #   - Cleanup workspace
+    publishers:
+      - postbuildscript:
+          builders:
+            - role: BOTH
+              build-on:
+                - ABORTED
+                - FAILURE
+                - NOT_BUILT
+                - SUCCESS
+                - UNSTABLE
+              build-steps:
+                - fdio-infra-ship-cov-7day
+          mark-unstable-if-failed: true
+      - workspace-cleanup:
+          exclude:
+            # Do not clean up *.jenkins-trigger files for jobs that use a
+            # properties file as input for triggering another build.
+            - "**/*.jenkins-trigger"
+          fail-build: false
+
+- publisher:
+    name: fdio-infra-publish-docs-7day
+    # macro to finish up a verify docs build.
+    #
+    # Handles the following:
+    #   - Mapping 7-day retention S3 bucket credentials for verify job docs upload
+    #   - Cleanup workspace
+    publishers:
+      - postbuildscript:
+          builders:
+            - role: BOTH
+              build-on:
+                - ABORTED
+                - FAILURE
+                - NOT_BUILT
+                - SUCCESS
+                - UNSTABLE
+              build-steps:
+                - fdio-infra-ship-docs-7day
+          mark-unstable-if-failed: true
+      - workspace-cleanup:
+          exclude:
+            # Do not clean up *.jenkins-trigger files for jobs that use a
+            # properties file as input for triggering another build.
+            - "**/*.jenkins-trigger"
+          fail-build: false
+
 - publisher:
     name: fdio-infra-publish
     # macro to finish up a build.
@@ -797,8 +872,8 @@
                 - SUCCESS
                 - UNSTABLE
               build-steps:
-                - shell: !include-raw: scripts/post_build_executor_info.sh
-                - shell: !include-raw: scripts/post_build_deploy_archives.sh
+                - shell: !include-raw-escape: scripts/post_build_executor_info.sh
+                - shell: !include-raw-escape: scripts/post_build_deploy_archives.sh
                 - fdio-infra-ship-logs
           mark-unstable-if-failed: true
       - workspace-cleanup:
@@ -856,9 +931,37 @@
           files:
             - file-id: "jenkins-s3-docs-ship"
               target: $HOME/.aws/credentials
+      - shell: !include-raw-escape:
+          - scripts/terraform_s3_docs_ship.sh
+      - shell: !include-raw-escape:
+          - scripts/publish_docs.sh
       - shell: !include-raw:
+          - ../global-jjb/shell/logs-clear-credentials.sh
+
+- builder:
+    name: fdio-infra-ship-cov-7day
+    builders:
+      - config-file-provider:
+          files:
+            - file-id: "jenkins-s3-vpp-docs-ship"
+              target: $HOME/.aws/credentials
+      - shell: !include-raw-escape:
           - scripts/terraform_s3_docs_ship.sh
+      - shell: !include-raw-escape:
+          - scripts/publish_cov.sh
       - shell: !include-raw:
+          - ../global-jjb/shell/logs-clear-credentials.sh
+
+- builder:
+    name: fdio-infra-ship-docs-7day
+    builders:
+      - config-file-provider:
+          files:
+            - file-id: "jenkins-s3-vpp-docs-ship"
+              target: $HOME/.aws/credentials
+      - shell: !include-raw-escape:
+          - scripts/terraform_s3_docs_ship.sh
+      - shell: !include-raw-escape:
           - scripts/publish_docs.sh
       - shell: !include-raw:
           - ../global-jjb/shell/logs-clear-credentials.sh
@@ -870,7 +973,7 @@
           files:
             - file-id: "jenkins-s3-log-ship"
               target: $HOME/.aws/credentials
-      - shell: !include-raw:
+      - shell: !include-raw-escape:
           - scripts/publish_library_py.sh
       - shell: !include-raw:
           - scripts/publish_logs.sh