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 888e01a871fa0c637432cf3fb65c1578a38d835c..c989a48fc2849b1814e7e57085390814d497d79a 100644 (file)
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -25,6 +25,10 @@
           controller-scope: "{controller-scope}"
           controller-use-features-boot: "{use-features-boot}"
           feature-elasticsearch-attribute: "{elasticsearch-attribute}"
+      - distribution-is-karaf-appl:
+          karaf-based-controller: "{karaf-based-controller}"
+      - distribution-karaf-version:
+          karaf-version: "{karaf-version}"
 
 - parameter:
     name: integration-controller-parameters
@@ -80,6 +84,14 @@
           default: "{branch}"
           description: "Distribution GIT branch"
 
+- parameter:
+    name: distribution-is-karaf-appl
+    parameters:
+      - string:
+          name: IS_KARAF_APPL
+          default: "{karaf-based-controller}"
+          description: "Boolean to let pipeline know if the project has a different deployer"
+
 - parameter:
     name: distribution-karaf-version
     # Arguments:
@@ -88,7 +100,7 @@
       - string:
           name: KARAF_VERSION
           default: "{karaf-version}"
-          description: "karaf3, karaf4, odl, affects ODL deploy scripts"
+          description: "karaf3, karaf4, odl, bgpcep, controller, netconf affects ODL deploy scripts"
 
 - parameter:
     name: integration-bundle-url
@@ -270,59 +282,10 @@
           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 #
 #################
 
-# Macro: integration-get-apex-addresses
-# Operation: this macro gets the IP addresses of the dynamic vms from apex snapshots
-# Used by: {project}-csit-* apex related job templates
-
-- builder:
-    name: integration-get-apex-addresses
-    builders:
-      - shell: !include-raw: integration-get-apex-addresses.sh
-
-# Macro: integration-apex-run-tests
-# Operation: this macro just runs the robot suites
-# Used by: {project}-csit-* apex related job templates
-
-- builder:
-    name: integration-apex-run-tests
-    builders:
-      - shell: !include-raw: integration-apex-run-tests.sh
-
 # Macro: integration-get-slave-addresses
 # Operation: this macro gets the IP addresses of the dynamic vms
 # Used by: {project}-csit-* job templates
@@ -363,6 +326,15 @@
     builders:
       - shell: !include-raw: integration-deploy-controller-run-test.sh
 
+# Macro: integration-deply-non-karaf-controller-run-test
+# Operation: this macro deploys non-karaf controller application and run test
+# Used by: {project}-csit-1node-* job templates
+
+- builder:
+    name: integration-run-test
+    builders:
+      - shell: !include-raw: integration-run-test.sh
+
 # Macro: integration-configure-clustering
 # Operation: this macro configures the clustering
 # Used by: {project}-csit-3node-* job templates
@@ -408,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
@@ -436,18 +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-apex-image-manager
-    builders:
-      - shell: !include-raw:
-          - ../opendaylight-infra-apex-image-management.sh
-
 - builder:
     name: integration-compare-distributions
     # Operation: will compare an already created distribtion (probably last
@@ -472,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:
@@ -546,10 +497,6 @@
                 - SUCCESS
                 - UNSTABLE
               build-steps:
-                - config-file-provider:
-                    files:
-                      - file-id: "odl-elastic-cloud"
-                        target: "${HOME}/.netrc"
                 - shell: |
                     #!/bin/bash
                     #The following script runs any configurable postplan stored in test/csit/postplans.
@@ -564,26 +511,5 @@
                             ${line}
                         done
                     fi
-                    rm ${HOME}/.netrc
           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