Merge "fix: do not consider only critical tests when checking thresholds"

[ci-management.git] / jjb / global-macros.yaml

diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml
index e00d42d..ad10825 100644 (file)
--- 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:
@@ -56,6 +48,14 @@
           default: '{make-test-os}'
           description: "The OS on which 'make test' is run."
 
+- parameter:
+    name: make-test-multiworker-os-parameter
+    parameters:
+      - string:
+          name: MAKE_TEST_MULTIWORKER_OS
+          default: '{make-test-multiworker-os}'
+          description: "The OS on which 'make test' is run with multiple VPP workers."
+
 - parameter:
     name: csit-fail-on-crc-mismatch-parameter
     parameters:
@@ -180,14 +180,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:
@@ -295,6 +287,22 @@
 
 #### TRIGGERS
 # Keep 'trigger' entries ordered alphabetically, please.
+- trigger:
+    name: gerrit-trigger-build
+    # Comes from hicn, some verify jobs wait for build to pass.
+    triggers:
+      - gerrit:
+          server-name: 'Primary'
+          trigger-on:
+            - comment-added-contains-event:
+                comment-contains-value: 'build_success-{stream}-{os}-{executor-arch}'
+          projects:
+            - project-compare-type: 'ANT'
+              project-pattern: '{name}'
+              branches:
+                - branch-compare-type: 'ANT'
+                  branch-pattern: '**/{branch}'
+
 - trigger:
     name: gerrit-trigger-checkstyle
     # Comes from VPP, some verify jobs wait for checkstyle to pass.
@@ -745,7 +753,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:
@@ -760,7 +768,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:
@@ -811,20 +818,6 @@
       - shell: |
           $WORKSPACE/scripts/check-unicode.sh jjb/
 
-- builder:
-    name: fdio-infra-ship-backup-logs
-    builders:
-      - config-file-provider:
-          files:
-            - file-id: "jenkins-s3-log-ship"
-              target: $HOME/.aws/credentials
-      - shell: !include-raw:
-          - scripts/publish_library_py.sh
-      - shell: !include-raw:
-          - scripts/publish_backup_logs.sh
-      - shell: !include-raw:
-          - ../global-jjb/shell/logs-clear-credentials.sh
-
 - builder:
     name: fdio-infra-ship-docs
     builders:
@@ -833,7 +826,7 @@
             - 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: