Remove hicn jobs for ubuntu 18 and centos 8

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

diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml
index 03b99f5..2fcc411 100644 (file)
--- a/jjb/global-macros.yaml
+++ b/jjb/global-macros.yaml
@@ -48,6 +48,14 @@
           default: '{make-parallel-jobs}'
           description: "The number of cores to use for builds."
 
+- parameter:
+    name: make-test-os-parameter
+    parameters:
+      - string:
+          name: MAKE_TEST_OS
+          default: '{make-test-os}'
+          description: "The OS on which 'make test' is run."
+
 - parameter:
     name: csit-fail-on-crc-mismatch-parameter
     parameters:
@@ -195,14 +203,6 @@
           name: TOPO
           default: '{topo}'
           description: "Topology parameter"
-
-- parameter:
-    name: workspace-archive-artifacts-parameter
-    parameters:
-      - string:
-          name: WS_ARCHIVE_ARTIFACTS
-          default: '{artifacts}'
-          description: "Artifacts to archive in $WORKSPACE/archives."
 # [end] Keep 'parameter' entries ordered alphabetically, please.
 
 #### SCMS
@@ -665,6 +665,7 @@
                 - 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: scripts/backup_upload_archives.sh
                 - fdio-infra-ship-logs
@@ -676,44 +677,6 @@
             - "**/*.jenkins-trigger"
           fail-build: false
 
-- publisher:
-    name: fdio-infra-shiplogs
-    # To archive things, the job will need to create an "archives" directory in
-    # the workspace and this macro will handle copying the contents of the
-    # archives directory.
-    #
-    # Uses the build parameter ARCHIVE_ARTIFACTS if not empty to find files to
-    # archive. You can pass globstar patterns for example "**/*.xml **/*.log" as
-    # the archive pattern. This is a space separated list of files to archive.
-    #
-    # Also ensure that the workspace is cleaned up at the end of the build.
-    publishers:
-      - postbuildscript:
-          builders:
-            - role: BOTH
-              build-on:
-                - ABORTED
-                - FAILURE
-                - NOT_BUILT
-                - SUCCESS
-                - UNSTABLE
-              build-steps:
-                - shell: !include-raw: include-raw-deploy-archives.sh
-                - shell: !include-raw: scripts/backup_upload_archives.sh
-                - maven-target:
-                    maven-version: '{maven-version}'
-                    pom: '.archives/deploy-archives.xml'
-                    goals: 'clean deploy -V -B -q -Dmaven.repo.local=/tmp/r'
-                    settings: 'jenkins-log-archives-settings'
-                    settings-type: cfp
-                    global-settings: 'global-settings'
-                    global-settings-type: cfp
-                - description-setter:
-                    regexp: '^Build logs: .*'
-          mark-unstable-if-failed: true
-      - workspace-cleanup:
-          fail-build: false
-
 - publisher:
     name: jacoco-report
     publishers: