X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Fglobal-macros.yaml;h=5043b8681cc3e348646ad7b4ff6a45a8fac08157;hb=837d9d2e6cb235c5b24c6bb74c93bedf9b723d28;hp=a144ccaa0a1171803301f08fd07298ba50613eb0;hpb=971335e145f71ac4b0cb5a3172f23bf20b8fa1e5;p=ci-management.git

diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml
index a144ccaa0..5043b8681 100644
--- a/jjb/global-macros.yaml
+++ b/jjb/global-macros.yaml
@@ -24,14 +24,6 @@
           default: '{arch}'
           description: "Architecture parameter"
 
-- parameter:
-    name: archive-artifacts-parameter
-    parameters:
-      - string:
-          name: ARCHIVE_ARTIFACTS
-          default: '{artifacts}'
-          description: "Artifacts to archive on the log server."
-
 - parameter:
     name: compiler-parameter
     parameters:
@@ -180,14 +172,6 @@
           # yamllint disable-line rule:line-length
           description: "JJB configured PROJECT parameter to identify a Gerrit project"
 
-- parameter:
-    name: repo-name-parameter
-    parameters:
-      - string:
-          name: REPO_NAME
-          default: '{repo-name}'
-          description: 'Name of repo to which to publish packaging'
-
 - parameter:
     name: stream-parameter
     parameters:
@@ -628,6 +612,72 @@
           fingerprint: true
           latest-only: true
 
+- publisher:
+    name: csit-trending-failed
+    publishers:
+      - email-ext:
+          # yamllint disable-line rule:line-length
+          recipients: 'tifrank@cisco.com, csit-report+int+616+181919729795594561@lists.fd.io'
+          reply-to: ''
+          content-type: 'text'
+          subject: '{branch}: Failed tests as of $BUILD_TIMESTAMP'
+          # yamllint disable-line rule:line-length
+          body: |
+              Following tests failed in the last trending job runs, listed per testbed type.
+
+              ${{FILE,path="resources/tools/presentation/_build/_static/vpp/trending-failed-tests.txt"}}
+          failure: false
+          success: true
+
+- publisher:
+    name: csit-trending-failed-job
+    publishers:
+      - email-ext:
+          # yamllint disable-line rule:line-length
+          recipients: 'tifrank@cisco.com, csit-report+int+616+181919729795594561@lists.fd.io'
+          reply-to: ''
+          content-type: 'text'
+          subject: '{branch}: The build number $BUILD_NUMBER of the job $JOB_NAME failed'
+          # yamllint disable-line rule:line-length
+          body: |
+              For more information see $BUILD_URL.
+          failure: true
+          success: false
+
+- publisher:
+    name: csit-trending-progressions
+    publishers:
+      - email-ext:
+          # yamllint disable-line rule:line-length
+          recipients: 'tifrank@cisco.com, csit-report+int+616+181919729795594561@lists.fd.io'
+          reply-to: ''
+          content-type: 'text'
+          subject: '{branch}: Progressions as of $BUILD_TIMESTAMP'
+          # yamllint disable-line rule:line-length
+          body: |
+              Following progressions occured in the last trending job runs, listed per testbed type.
+
+              ${{FILE,path="resources/tools/presentation/_build/_static/vpp/trending-progressions.txt"}}
+          failure: false
+          success: true
+
+- publisher:
+    name: csit-trending-regressions
+    publishers:
+      - email-ext:
+          # yamllint disable-line rule:line-length
+          recipients: 'tifrank@cisco.com, csit-report+int+616+181919729795594561@lists.fd.io'
+          reply-to: ''
+          content-type: 'text'
+          subject: '{branch}: Regressions as of $BUILD_TIMESTAMP'
+          # yamllint disable-line rule:line-length
+          body: |
+              Following regressions occured in the last trending job runs, listed per testbed type.
+
+              ${{FILE,path="resources/tools/presentation/_build/_static/vpp/trending-regressions.txt"}}
+          failure: false
+          success: true
+
 - publisher:
     name: email-notification
     publishers:
@@ -679,7 +729,7 @@
     # macro to finish up a build.
     #
     # Handles the following:
-    #   - Shipping logs to Nexus or S3 logs repository
+    #   - Shipping logs to S3 logs repository
     #   - Cleanup workspace
     publishers:
       - postbuildscript:
@@ -694,7 +744,6 @@
               build-steps:
                 - shell: !include-raw: scripts/post_build_executor_info.sh
                 - shell: !include-raw: scripts/post_build_deploy_archives.sh
-                - fdio-infra-ship-backup-logs
                 - fdio-infra-ship-logs
           mark-unstable-if-failed: true
       - workspace-cleanup:
@@ -734,6 +783,7 @@
       - robot:
           output-path: '{output-path}'
           other-files: ''
+
 # [end] Keep 'publisher' entries ordered alphabetically, please.
 
 #### BUILDERS
@@ -744,70 +794,33 @@
       - shell: |
           $WORKSPACE/scripts/check-unicode.sh jjb/
 
-- property:
-    name: fdio-infra-properties
-    properties:
-      - build-discarder:
-          days-to-keep: '{build-days-to-keep}'
-          num-to-keep: '{build-num-to-keep}'
-
 - builder:
     name: fdio-infra-ship-docs
     builders:
-      - config-file-provider:
-          files:
-            - file-id: "jenkins-log-archives-settings"
-              variable: "SETTINGS_FILE"
       - config-file-provider:
           files:
             - file-id: "jenkins-s3-docs-ship"
               target: $HOME/.aws/credentials
       - shell: !include-raw:
-          - scripts/publish_library_py.sh
+          - scripts/terraform_s3_docs_ship.sh
       - shell: !include-raw:
           - scripts/publish_docs.sh
       - shell: !include-raw:
           - ../global-jjb/shell/logs-clear-credentials.sh
 
 - builder:
-    name: fdio-infra-ship-backup-logs
+    name: fdio-infra-ship-logs
     builders:
       - config-file-provider:
           files:
             - file-id: "jenkins-s3-log-ship"
-              variable: $HOME/.aws/credentials
+              target: $HOME/.aws/credentials
       - shell: !include-raw:
           - scripts/publish_library_py.sh
       - shell: !include-raw:
           - scripts/publish_logs.sh
       - shell: !include-raw:
           - ../global-jjb/shell/logs-clear-credentials.sh
-
-- builder:
-    name: fdio-infra-ship-logs
-    builders:
-      # Ensure no pre-existing .netrc files are overriding logs config
-      - lf-provide-maven-settings-cleanup
-      - config-file-provider:
-          files:
-            - file-id: "jenkins-log-archives-settings"
-              variable: "SETTINGS_FILE"
-      - conditional-step:
-          condition-kind: regex-match
-          regex: "^.*logs-s3.*"
-          label: $S3_BUCKET
-          on-evaluation-failure: dont-run
-          steps:
-            - config-file-provider:
-                files:
-                  - file-id: "jenkins-s3-log-ship"
-                    target: $HOME/.aws/credentials
-      - lf-infra-create-netrc:
-          server-id: logs
-      - shell: !include-raw:
-          - ../global-jjb/shell/logs-deploy.sh
-      - shell: !include-raw:
-          - ../global-jjb/shell/logs-clear-credentials.sh
       - description-setter:
           regexp: "(^S3 build logs: .*)"