Merge "Increase test coverage"

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

diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml
index 7474697d7e06d3f6da44f1c9584ab50e34c97c5a..893d6b7236229b8d0f3097df2f45e7fdaf8d6951 100644 (file)
--- a/jjb/releng-macros.yaml
+++ b/jjb/releng-macros.yaml
@@ -346,6 +346,13 @@
       - shell: !include-raw: opendaylight-infra-stack.sh
       - shell: !include-raw-escape: opendaylight-infra-copy-ssh-keys.sh
 
+- builder:
+    name: opendaylight-apex-stack
+    # opendaylight-apex-stack.sh has a required variable {stack-template} that
+    # must be passed into this macro.
+    builders:
+      - shell: !include-raw: opendaylight-infra-stack.sh
+
 - builder:
     name: distribute-build-url
     # Place URL of the current run of a build job to a file at given path.
@@ -454,9 +461,8 @@
                 - UNSTABLE
               build-steps:
                 - shell: |
-                    #!/bin/bash
+                    #!/bin/bash -l
                     echo "Deleting $STACK_NAME"
-                    source "/tmp/v/openstack/bin/activate"
                     openstack stack delete --yes "$STACK_NAME"
           mark-unstable-if-failed: false