Merge "Chore: update pre-commit repos revisions"

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

diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index 888e01a871fa0c637432cf3fb65c1578a38d835c..9522fd937f99ed347d892269fb4b8a3029623f95 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, controller, netconf affects ODL deploy scripts"
 
 - parameter:
     name: integration-bundle-url
@@ -305,24 +317,6 @@
 # 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 +357,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
@@ -442,12 +445,6 @@
       - 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