Merge "Update transportpce jobs"

[releng/builder.git] / jjb / integration / integration-macros.yaml

diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index c89d032197090c19303283f17fc23e5f8064b316..c989a48fc2849b1814e7e57085390814d497d79a 100644 (file)
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -100,7 +100,7 @@
       - string:
           name: KARAF_VERSION
           default: "{karaf-version}"
-          description: "karaf3, karaf4, odl, controller, netconf affects ODL deploy scripts"
+          description: "karaf3, karaf4, odl, bgpcep, controller, netconf affects ODL deploy scripts"
 
 - parameter:
     name: integration-bundle-url
@@ -282,37 +282,6 @@
           jobs: "{jobs}"
           result: "success"
 
-# Macro: integration-openstack-controller-mininet
-# Operation: this macro will spin the controller and mininet vms
-# Used by: {project}-csit-* job templates
-
-- wrapper:
-    name: integration-openstack-controller-mininet
-    wrappers:
-      - openstack:
-          instances:
-            - cloud-name: "ODLRPC"
-              template-name: "{controller-image}"
-              count: "{controller-vms}"
-            - cloud-name: "ODLRPC"
-              template-name: "{mininet-image}"
-              count: "{mininet-vms}"
-
-# Macro: integration-openstack-controller-devstack
-# Operation: this macro will spin the controller and devstack vms
-# Used by: {project}-csit-openstack job templates
-- wrapper:
-    name: integration-openstack-controller-devstack
-    wrappers:
-      - openstack:
-          instances:
-            - cloud-name: "ODLRPC"
-              template-name: "{controller-image}"
-              count: "{controller-vms}"
-            - cloud-name: "ODLRPC"
-              template-name: "{openstack-image}"
-              count: "{openstack-vms}"
-
 #################
 # Shell Scripts #
 #################
@@ -411,15 +380,6 @@
     builders:
       - shell: !include-raw: multipatch-distribution.sh
 
-# Macro: integration-cleanup-workspace
-# Operation: Cleans up files possibly left there by the previous build
-# Used by: {project}-csit-* job templates
-
-- builder:
-    name: integration-cleanup-workspace
-    builders:
-      - shell: !include-raw: integration-cleanup-workspace.sh
-
 # Macro: integration-rebase-patch
 # Operation: For cloned project, rebase checked-out Gerrit patch onto $DISTROBRANCH.
 # Used by: integration-patch-distribution-* job template
@@ -439,12 +399,6 @@
           - copy-common-functions.sh
           - common-functions.sh
 
-- builder:
-    name: integration-deploy-openstack-run-test
-    builders:
-      - shell: !include-raw:
-          - integration-deploy-openstack-run-test.sh
-
 - builder:
     name: integration-compare-distributions
     # Operation: will compare an already created distribtion (probably last
@@ -469,7 +423,7 @@
           files:
             - file-id: global-settings
               variable: GLOBAL_SETTINGS_FILE
-            - file-id: integration-settings
+            - file-id: "{settings-project}-settings"
               variable: SETTINGS_FILE
       - integration-set-variables
       - inject:
@@ -559,23 +513,3 @@
                     fi
           mark-unstable-if-failed: true
 
-- publisher:
-    name: integration-csit-collect-netvirt-logs
-    publishers:
-      - postbuildscript:
-          builders:
-            - role: BOTH
-              build-on:
-                - ABORTED
-                - FAILURE
-                - NOT_BUILT
-                - SUCCESS
-                - UNSTABLE
-              build-steps:
-                - inject:
-                    properties-file: "slave_addresses.txt"
-                - shell: |
-                    #!/bin/bash
-                    source /tmp/common-functions.sh ${BUNDLEFOLDER}
-                    collect_netvirt_logs
-          mark-unstable-if-failed: true