[asterisk-scf-commits] asterisk-scf/release/testsuite.git branch "master" updated.

Commits to the Asterisk SCF project code repositories asterisk-scf-commits at lists.digium.com
Wed May 9 13:21:18 CDT 2012


branch "master" has been updated
       via  1e9daabca5e056dc4f9ac8d357dfac7f285a03d6 (commit)
       via  fb388b74e6731b4d5e1737fba9119fee2ea0ecc4 (commit)
       via  8628aad69f67eb98472dd39301aba94d7d46afd5 (commit)
       via  1d60982d04e3aaf6ff5924bc37d79a8bbca60115 (commit)
       via  64977016f1935261da8d20a967fe21cd13709782 (commit)
       via  fe879801bc69e2bb03ebffc84475a81ffbfbbfd0 (commit)
       via  db5d2b956f942825f36d643a64c6f297f136eae4 (commit)
       via  5df4f7cb8724c0886730d9b7e1752ccd8678424e (commit)
       via  6e5373028c57851ddacf489d66291109bb16aba5 (commit)
      from  73453c2c882229d46607502637b9c2cd9cceb119 (commit)

Summary of changes:
 bamboo/Makefile                                    |   19 --
 bamboo/Makefile.mak                                |   13 -
 bamboo/bin/boost_to_junit.xsl                      |   79 ------
 bamboo/bin/tests.py                                |  290 --------------------
 bamboo/bin/visual_studio_wrapper.bat               |   38 ---
 .../contrib/init.d/com.atlassian.BambooAgent.plist |   23 --
 .../contrib/init.d/rc.debian.bamboo-remote-agent   |   28 --
 .../contrib/init.d/rc.redhat.bamboo-remote-agent   |   24 --
 configs/server/remoteAgents.yaml                   |    4 +-
 lib/python/Misc.py                                 |    2 +-
 plugins/asteriskscf_icebox.py                      |    2 +-
 plugins/failover.py                                |    2 +-
 tests/asteriskscf/failover/bridge/testcase.yaml    |    8 +-
 .../failover/media_ops_core/testcase.yaml          |    8 +-
 tests/asteriskscf/failover/media_rtp/testcase.yaml |    7 +-
 .../testcase.yaml                                  |   24 +-
 tests/asteriskscf/failover/routing/testcase.yaml   |    8 +-
 .../failover/service_discovery/testcase.yaml       |   24 +-
 tests/asteriskscf/failover/sip/testcase.yaml       |   23 +-
 tests/asteriskscf/failover/tests.yaml              |   11 +-
 tests/asteriskscf/sip/tests.yaml                   |    9 +-
 tests/asteriskscf/tests.yaml                       |    2 +-
 tests/build/asterisk_scf/testcase.yaml             |    2 +
 tests/build/testing/testcase.yaml                  |    6 +-
 tests/build/tests.yaml                             |    2 +-
 tests/tests.yaml                                   |    6 +-
 26 files changed, 84 insertions(+), 580 deletions(-)
 delete mode 100644 bamboo/Makefile
 delete mode 100644 bamboo/Makefile.mak
 delete mode 100644 bamboo/bin/boost_to_junit.xsl
 delete mode 100644 bamboo/bin/tests.py
 delete mode 100644 bamboo/bin/visual_studio_wrapper.bat
 delete mode 100644 bamboo/contrib/init.d/com.atlassian.BambooAgent.plist
 delete mode 100644 bamboo/contrib/init.d/rc.debian.bamboo-remote-agent
 delete mode 100644 bamboo/contrib/init.d/rc.redhat.bamboo-remote-agent
 copy tests/asteriskscf/failover/{media_rtp => media_transport_udptl}/testcase.yaml (89%)


- Log -----------------------------------------------------------------
commit 1e9daabca5e056dc4f9ac8d357dfac7f285a03d6
Author: Darren Sessions <dsessions at digium.com>
Date:   Wed May 9 13:20:34 2012 -0500

    Modified the SCF master test yaml file to run failover tests while that is the current focus. Will updated soon to turn back on all the other tests.

diff --git a/tests/asteriskscf/tests.yaml b/tests/asteriskscf/tests.yaml
index a1f846d..7e665c5 100644
--- a/tests/asteriskscf/tests.yaml
+++ b/tests/asteriskscf/tests.yaml
@@ -1,7 +1,7 @@
 tests :
     - failover
+#    - sip
 #    - service_locator
 #    - bridge
 #    - routing
-#    - sip
 #    - media

commit fb388b74e6731b4d5e1737fba9119fee2ea0ecc4
Author: Darren Sessions <dsessions at digium.com>
Date:   Wed May 9 13:20:01 2012 -0500

    Now that we are not building against test branches, this commit restores the build testplans to their regular release repos.

diff --git a/tests/build/tests.yaml b/tests/build/tests.yaml
index 2de8056..fae674a 100644
--- a/tests/build/tests.yaml
+++ b/tests/build/tests.yaml
@@ -1,2 +1,2 @@
 testcase :
-    - testing
+    - asteriskscf

commit 8628aad69f67eb98472dd39301aba94d7d46afd5
Author: Darren Sessions <dsessions at digium.com>
Date:   Wed May 9 13:19:10 2012 -0500

    Modified the SCF master test yaml file to run failover tests while that is the current focus. Will updated soon to turn back on all the other tests.

diff --git a/tests/asteriskscf/sip/tests.yaml b/tests/asteriskscf/sip/tests.yaml
index 4ec0a7a..09c22cd 100644
--- a/tests/asteriskscf/sip/tests.yaml
+++ b/tests/asteriskscf/sip/tests.yaml
@@ -6,12 +6,11 @@ docs :
     overview : 'SIP overview goes here'
 testcase :
 #    - configurator
-    - Functional_Simple_Call_Plus_Failover
+#    - Functional_Simple_Call_Plus_Failover
 #    - testing
-#    - Functional_RTCP_Simple
 
-#    - Functional_Simple_Endpoint
-#    - Functional_Busy_Endpoint
+##    - Functional_Simple_Endpoint
+    - Functional_Busy_Endpoint
 #    - Functional_Timeout_Endpoint
 #    - Functional_Congestion_Endpoint
 
@@ -25,5 +24,7 @@ testcase :
 
 #    - Functional_Simple_Endpoint_Failover
 
+#    - Functional_RTCP_Simple
+
 ##    - Functional_Verify_Options_Method
 ##    - Stress_PROTOS_TestSuite_c07_sip_r2

commit 1d60982d04e3aaf6ff5924bc37d79a8bbca60115
Author: Darren Sessions <dsessions at digium.com>
Date:   Wed May 9 13:17:52 2012 -0500

    Updated the SCF build testcase to include additional testsuite remote agents that have been moved or restored.

diff --git a/tests/build/asterisk_scf/testcase.yaml b/tests/build/asterisk_scf/testcase.yaml
index 8db3a6b..92c5003 100644
--- a/tests/build/asterisk_scf/testcase.yaml
+++ b/tests/build/asterisk_scf/testcase.yaml
@@ -42,6 +42,7 @@ tests :
                     redistribute :
                         remotes :
                             - testsuite-remote-1.digium.internal
+                            - testsuite-remote-2.digium.internal
                             - testsuite-remote-3.digium.internal
                             - testsuite-remote-4.digium.internal
                             - testsuite-remote-5.digium.internal
@@ -67,6 +68,7 @@ tests :
                     redistribute :
                         remotes :
                             - testsuite-remote-1.digium.internal
+                            - testsuite-remote-2.digium.internal
                             - testsuite-remote-3.digium.internal
                             - testsuite-remote-4.digium.internal
                             - testsuite-remote-5.digium.internal

commit 64977016f1935261da8d20a967fe21cd13709782
Author: Darren Sessions <dsessions at digium.com>
Date:   Wed May 9 13:16:56 2012 -0500

    Created a new testcase that will fetch from branches.

diff --git a/tests/build/testing/testcase.yaml b/tests/build/testing/testcase.yaml
index 69af0ff..efb80fd 100644
--- a/tests/build/testing/testcase.yaml
+++ b/tests/build/testing/testcase.yaml
@@ -18,7 +18,8 @@ tests :
                     redistribute :
                         remotes :
                             - testsuite-remote-1.digium.internal
-                            #- testsuite-remote-3.digium.internal
+                            - testsuite-remote-2.digium.internal
+                            - testsuite-remote-3.digium.internal
                             - testsuite-remote-4.digium.internal
                             - testsuite-remote-5.digium.internal
                             - testsuite-remote-6.digium.internal
@@ -57,7 +58,8 @@ tests :
                     redistribute :
                         remotes :
                             - testsuite-remote-1.digium.internal
-                            #- testsuite-remote-3.digium.internal
+                            - testsuite-remote-2.digium.internal
+                            - testsuite-remote-3.digium.internal
                             - testsuite-remote-4.digium.internal
                             - testsuite-remote-5.digium.internal
                             - testsuite-remote-6.digium.internal

commit fe879801bc69e2bb03ebffc84475a81ffbfbbfd0
Author: Darren Sessions <dsessions at digium.com>
Date:   Wed May 9 13:16:11 2012 -0500

    Make sure both SCF build tests and functional tests are turned on.

diff --git a/tests/tests.yaml b/tests/tests.yaml
index d020373..e350502 100644
--- a/tests/tests.yaml
+++ b/tests/tests.yaml
@@ -1,4 +1,4 @@
 tests :
-    - build
-#dir :
-#    - asteriskscf
+   - build
+dir :
+    - asteriskscf

commit db5d2b956f942825f36d643a64c6f297f136eae4
Author: Darren Sessions <dsessions at digium.com>
Date:   Wed May 9 13:15:22 2012 -0500

    New failover tests for all SCF components.

diff --git a/tests/asteriskscf/failover/bridge/testcase.yaml b/tests/asteriskscf/failover/bridge/testcase.yaml
index 71e4a9d..64ab626 100644
--- a/tests/asteriskscf/failover/bridge/testcase.yaml
+++ b/tests/asteriskscf/failover/bridge/testcase.yaml
@@ -14,11 +14,12 @@ tests :
             - failover :
                 cmd :
                     assign :
-                        active_testsuite_remote_host : [testsuite-remote-3.digium.internal, public1, ipv4]
+                        active_testsuite_remote_host : [testsuite-remote-10.digium.internal, public1, ipv4]
                         standby_testsuite_remote_host : [testsuite-remote-4.digium.internal, public1, ipv4]
                         address_pool : failover_pool_1
                         shared_ip_label : failover-shared-ip-1
             - asteriskscf_icebox :
+                service_locator : [testsuite-remote-1.digium.internal, public1, ipv4]
                 remote_agent : [testsuite-remote-1.digium.internal, public1, ipv4]
                 cmd :
                     start :
@@ -31,7 +32,7 @@ tests :
                         mode : failover
             - asteriskscf_icebox :
                 service_locator : [testsuite-remote-1.digium.internal, public1, ipv4]
-                remote_agent : [testsuite-remote-3.digium.internal, public1, ipv4]
+                remote_agent : [testsuite-remote-10.digium.internal, public1, ipv4]
                 shared_addr : [failover-shared-ip-1, public1, ipv4]
                 cmd :
                     start :
@@ -56,6 +57,7 @@ tests :
                         instance_id : BridgeManagerActive
                         service_name : default
             - asteriskscf_icebox :
+                service_locator : [testsuite-remote-1.digium.internal, public1, ipv4]
                 remote_agent : [testsuite-remote-1.digium.internal, public1, ipv4]
                 cmd :
                     start :
@@ -122,7 +124,7 @@ tests :
             - failover :
                 cmd :
                     failover :
-                        active_testsuite_remote_host : [testsuite-remote-3.digium.internal, public1, ipv4]
+                        active_testsuite_remote_host : [testsuite-remote-10.digium.internal, public1, ipv4]
                         standby_testsuite_remote_host : [testsuite-remote-4.digium.internal, public1, ipv4]
                         address_pool : failover_pool_1
                         shared_ip_label : failover-shared-ip-1
diff --git a/tests/asteriskscf/failover/media_ops_core/testcase.yaml b/tests/asteriskscf/failover/media_ops_core/testcase.yaml
index c8b0a61..a3a1dd3 100644
--- a/tests/asteriskscf/failover/media_ops_core/testcase.yaml
+++ b/tests/asteriskscf/failover/media_ops_core/testcase.yaml
@@ -14,11 +14,12 @@ tests :
             - failover :
                 cmd :
                     assign :
-                        active_testsuite_remote_host : [testsuite-remote-3.digium.internal, public1, ipv4]
+                        active_testsuite_remote_host : [testsuite-remote-10.digium.internal, public1, ipv4]
                         standby_testsuite_remote_host : [testsuite-remote-4.digium.internal, public1, ipv4]
                         address_pool : failover_pool_1
                         shared_ip_label : failover-shared-ip-1
             - asteriskscf_icebox :
+                service_locator : [testsuite-remote-1.digium.internal, public1, ipv4]
                 remote_agent : [testsuite-remote-1.digium.internal, public1, ipv4]
                 cmd :
                     start :
@@ -30,7 +31,7 @@ tests :
                         mode : failover
             - asteriskscf_icebox :
                 service_locator : [testsuite-remote-1.digium.internal, public1, ipv4]
-                remote_agent : [testsuite-remote-3.digium.internal, public1, ipv4]
+                remote_agent : [testsuite-remote-10.digium.internal, public1, ipv4]
                 shared_addr : [failover-shared-ip-1, public1, ipv4]
                 cmd :
                     start :
@@ -55,6 +56,7 @@ tests :
                         instance_id : MediaServiceRTPActive
                         service_name : default
             - asteriskscf_icebox :
+                service_locator : [testsuite-remote-1.digium.internal, public1, ipv4]
                 remote_agent : [testsuite-remote-1.digium.internal, public1, ipv4]
                 cmd :
                     start :
@@ -122,7 +124,7 @@ tests :
             - failover :
                 cmd :
                     failover :
-                        active_testsuite_remote_host : [testsuite-remote-3.digium.internal, public1, ipv4]
+                        active_testsuite_remote_host : [testsuite-remote-10.digium.internal, public1, ipv4]
                         standby_testsuite_remote_host : [testsuite-remote-4.digium.internal, public1, ipv4]
                         address_pool : failover_pool_1
                         shared_ip_label : failover-shared-ip-1
diff --git a/tests/asteriskscf/failover/media_rtp/testcase.yaml b/tests/asteriskscf/failover/media_rtp/testcase.yaml
index c9fbde9..9b25a64 100644
--- a/tests/asteriskscf/failover/media_rtp/testcase.yaml
+++ b/tests/asteriskscf/failover/media_rtp/testcase.yaml
@@ -14,7 +14,7 @@ tests :
             - failover :
                 cmd :
                     assign :
-                        active_testsuite_remote_host : [testsuite-remote-3.digium.internal, public1, ipv4]
+                        active_testsuite_remote_host : [testsuite-remote-10.digium.internal, public1, ipv4]
                         standby_testsuite_remote_host : [testsuite-remote-4.digium.internal, public1, ipv4]
                         address_pool : failover_pool_1
                         shared_ip_label : failover-shared-ip-1
@@ -31,7 +31,7 @@ tests :
                         mode : failover
             - asteriskscf_icebox :
                 service_locator : [testsuite-remote-1.digium.internal, public1, ipv4]
-                remote_agent : [testsuite-remote-3.digium.internal, public1, ipv4]
+                remote_agent : [testsuite-remote-10.digium.internal, public1, ipv4]
                 shared_addr : [failover-shared-ip-1, public1, ipv4]
                 cmd :
                     start :
@@ -56,6 +56,7 @@ tests :
                         instance_id : MediaServiceRTPActive
                         service_name : default
             - asteriskscf_icebox :
+                service_locator : [testsuite-remote-1.digium.internal, public1, ipv4]
                 remote_agent : [testsuite-remote-1.digium.internal, public1, ipv4]
                 cmd :
                     start :
@@ -123,7 +124,7 @@ tests :
             - failover :
                 cmd :
                     failover :
-                        active_testsuite_remote_host : [testsuite-remote-3.digium.internal, public1, ipv4]
+                        active_testsuite_remote_host : [testsuite-remote-10.digium.internal, public1, ipv4]
                         standby_testsuite_remote_host : [testsuite-remote-4.digium.internal, public1, ipv4]
                         address_pool : failover_pool_1
                         shared_ip_label : failover-shared-ip-1
diff --git a/tests/asteriskscf/failover/media_rtp/testcase.yaml b/tests/asteriskscf/failover/media_transport_udptl/testcase.yaml
similarity index 89%
copy from tests/asteriskscf/failover/media_rtp/testcase.yaml
copy to tests/asteriskscf/failover/media_transport_udptl/testcase.yaml
index c9fbde9..91a9eb0 100644
--- a/tests/asteriskscf/failover/media_rtp/testcase.yaml
+++ b/tests/asteriskscf/failover/media_transport_udptl/testcase.yaml
@@ -1,4 +1,4 @@
-name : Functional_Failover_Media_Service_RTP
+name : Functional_Failover_Media_Transport_UDPTL
 docs :
     template : generic
     category : functional
@@ -14,7 +14,7 @@ tests :
             - failover :
                 cmd :
                     assign :
-                        active_testsuite_remote_host : [testsuite-remote-3.digium.internal, public1, ipv4]
+                        active_testsuite_remote_host : [testsuite-remote-10.digium.internal, public1, ipv4]
                         standby_testsuite_remote_host : [testsuite-remote-4.digium.internal, public1, ipv4]
                         address_pool : failover_pool_1
                         shared_ip_label : failover-shared-ip-1
@@ -27,16 +27,17 @@ tests :
                             - ServiceDiscovery
                             - Logger
                             - MediaFormatGeneric
-                            - MediaServiceRTPStateReplicator
+                            - MediaServiceRTP
+                            - MediaTransportUDPTLStateReplicator
                         mode : failover
             - asteriskscf_icebox :
                 service_locator : [testsuite-remote-1.digium.internal, public1, ipv4]
-                remote_agent : [testsuite-remote-3.digium.internal, public1, ipv4]
+                remote_agent : [testsuite-remote-10.digium.internal, public1, ipv4]
                 shared_addr : [failover-shared-ip-1, public1, ipv4]
                 cmd :
                     start :
                         components :
-                            - MediaServiceRTPActive
+                            - MediaTransportUDPTLActive
                         mode : failover
             - asteriskscf_icebox :
                 service_locator : [testsuite-remote-1.digium.internal, public1, ipv4]
@@ -45,18 +46,19 @@ tests :
                 cmd :
                     start :
                         components :
-                            - MediaServiceRTPStandby
+                            - MediaTransportUDPTLStandby
                         mode : failover
             - asteriskscf_activator :
                 discovery_replica_host : [testsuite-remote-1.digium.internal, public1, ipv4]
                 service_locator_host : [testsuite-remote-1.digium.internal, public1, ipv4]
                 cmd :
                     activate :
-                        replica_name : MediaRTPService.Replica
-                        instance_id : MediaServiceRTPActive
+                        replica_name : MediaUDPTLService.Replica
+                        instance_id : MediaTransportUDPTLActive
                         service_name : default
             - asteriskscf_icebox :
                 remote_agent : [testsuite-remote-1.digium.internal, public1, ipv4]
+                service_locator : [testsuite-remote-1.digium.internal, public1, ipv4]
                 cmd :
                     start :
                         components :
@@ -123,7 +125,7 @@ tests :
             - failover :
                 cmd :
                     failover :
-                        active_testsuite_remote_host : [testsuite-remote-3.digium.internal, public1, ipv4]
+                        active_testsuite_remote_host : [testsuite-remote-10.digium.internal, public1, ipv4]
                         standby_testsuite_remote_host : [testsuite-remote-4.digium.internal, public1, ipv4]
                         address_pool : failover_pool_1
                         shared_ip_label : failover-shared-ip-1
@@ -132,8 +134,8 @@ tests :
                 service_locator_host : [testsuite-remote-1.digium.internal, public1, ipv4]
                 cmd :
                     activate :
-                        replica_name : MediaRTPService.Replica
-                        instance_id : MediaServiceRTPStandby
+                        replica_name : MediaUDPTLService.Replica
+                        instance_id : MediaTransportUDPTLStandby
                         service_name : default
             - sipp:         
                 remote_agent : [testsuite-remote-5.digium.internal, public1, ipv4]
diff --git a/tests/asteriskscf/failover/routing/testcase.yaml b/tests/asteriskscf/failover/routing/testcase.yaml
index 92e8536..7c3309f 100644
--- a/tests/asteriskscf/failover/routing/testcase.yaml
+++ b/tests/asteriskscf/failover/routing/testcase.yaml
@@ -14,12 +14,13 @@ tests :
             - failover :
                 cmd :
                     assign :
-                        active_testsuite_remote_host : [testsuite-remote-3.digium.internal, public1, ipv4]
+                        active_testsuite_remote_host : [testsuite-remote-10.digium.internal, public1, ipv4]
                         standby_testsuite_remote_host : [testsuite-remote-4.digium.internal, public1, ipv4]
                         address_pool : failover_pool_1
                         shared_ip_label : failover-shared-ip-1
             - asteriskscf_icebox :
                 remote_agent : [testsuite-remote-1.digium.internal, public1, ipv4]
+                service_locator : [testsuite-remote-1.digium.internal, public1, ipv4]
                 cmd :
                     start :
                         components :
@@ -32,7 +33,7 @@ tests :
                         mode : failover
             - asteriskscf_icebox :
                 service_locator : [testsuite-remote-1.digium.internal, public1, ipv4]
-                remote_agent : [testsuite-remote-3.digium.internal, public1, ipv4]
+                remote_agent : [testsuite-remote-10.digium.internal, public1, ipv4]
                 shared_addr : [failover-shared-ip-1, public1, ipv4]
                 cmd :
                     start :
@@ -57,6 +58,7 @@ tests :
                         instance_id : RoutingServiceActive
                         service_name : default
             - asteriskscf_icebox :
+                service_locator : [testsuite-remote-1.digium.internal, public1, ipv4]
                 remote_agent : [testsuite-remote-1.digium.internal, public1, ipv4]
                 cmd :
                     start :
@@ -122,7 +124,7 @@ tests :
             - failover :
                 cmd :
                     failover :
-                        active_testsuite_remote_host : [testsuite-remote-3.digium.internal, public1, ipv4]
+                        active_testsuite_remote_host : [testsuite-remote-10.digium.internal, public1, ipv4]
                         standby_testsuite_remote_host : [testsuite-remote-4.digium.internal, public1, ipv4]
                         address_pool : failover_pool_1
                         shared_ip_label : failover-shared-ip-1
diff --git a/tests/asteriskscf/failover/service_discovery/testcase.yaml b/tests/asteriskscf/failover/service_discovery/testcase.yaml
index 7c6079d..5c73d16 100644
--- a/tests/asteriskscf/failover/service_discovery/testcase.yaml
+++ b/tests/asteriskscf/failover/service_discovery/testcase.yaml
@@ -14,7 +14,7 @@ tests :
             - failover :
                 cmd :
                     assign :
-                        active_testsuite_remote_host : [testsuite-remote-3.digium.internal, public1, ipv4]
+                        active_testsuite_remote_host : [testsuite-remote-10.digium.internal, public1, ipv4]
                         standby_testsuite_remote_host : [testsuite-remote-4.digium.internal, public1, ipv4]
                         address_pool : failover_pool_1
                         shared_ip_label : failover-shared-ip-1
@@ -28,7 +28,7 @@ tests :
                         mode : failover
             - asteriskscf_icebox :
                 service_locator : [testsuite-remote-1.digium.internal, public1, ipv4]
-                remote_agent : [testsuite-remote-3.digium.internal, public1, ipv4]
+                remote_agent : [testsuite-remote-10.digium.internal, public1, ipv4]
                 shared_addr : [failover-shared-ip-1, public1, ipv4]
                 cmd :
                     start :
@@ -45,14 +45,15 @@ tests :
                             - ServiceDiscoveryStandby
                         mode : failover
             - asteriskscf_activator :
-                discovery_replica_host : [testsuite-remote-1.digium.internal, public1, ipv4]
-                service_locator_host : [testsuite-remote-1.digium.internal, public1, ipv4]
+                skip_service_locator_host : True
+                discovery_replica_host : [failover-shared-ip-1, public1, ipv4] 
                 cmd :
                     activate :
-                        replica_name : ServiceDiscovery.Replica
+                        replica_name : ServiceLocatorReplica
                         instance_id : ServiceDiscoveryActive
                         service_name : default
             - asteriskscf_icebox :
+                service_locator : [failover-shared-ip-1, public1, ipv4]
                 remote_agent : [testsuite-remote-1.digium.internal, public1, ipv4]
                 cmd :
                     start :
@@ -60,12 +61,13 @@ tests :
                             - Logger
                             - MediaFormatGeneric
                             - MediaServiceRTP
+                            - MediaTransportUDPTL
                             - BridgeManager
                             - RoutingService
                             - SIPService
                         mode : failover
             - asteriskscf_configurator :
-                service_locator_host : [testsuite-remote-1.digium.internal, public1, ipv4]
+                service_locator_host : [failover-shared-ip-1, public1, ipv4]
                 configuration_wipe : False
                 cmd :
                     sip :
@@ -123,17 +125,17 @@ tests :
             - failover :
                 cmd :
                     failover :
-                        active_testsuite_remote_host : [testsuite-remote-3.digium.internal, public1, ipv4]
+                        active_testsuite_remote_host : [testsuite-remote-10.digium.internal, public1, ipv4]
                         standby_testsuite_remote_host : [testsuite-remote-4.digium.internal, public1, ipv4]
                         address_pool : failover_pool_1
                         shared_ip_label : failover-shared-ip-1
             - asteriskscf_activator :
-                discovery_replica_host : [testsuite-remote-1.digium.internal, public1, ipv4]
-                service_locator_host : [testsuite-remote-1.digium.internal, public1, ipv4]
+                skip_service_locator_host : True
+                discovery_replica_host : [failover-shared-ip-1, public1, ipv4]
                 cmd :
                     activate :
-                        replica_name : RoutingService.Replica
-                        instance_id : RoutingServiceStandby
+                        replica_name : ServiceLocatorReplica
+                        instance_id : ServiceDiscoveryStandby
                         service_name : default
             - sipp:         
                 remote_agent : [testsuite-remote-5.digium.internal, public1, ipv4]
diff --git a/tests/asteriskscf/failover/sip/testcase.yaml b/tests/asteriskscf/failover/sip/testcase.yaml
index 0953624..b1514a3 100644
--- a/tests/asteriskscf/failover/sip/testcase.yaml
+++ b/tests/asteriskscf/failover/sip/testcase.yaml
@@ -14,11 +14,12 @@ tests :
             - failover :
                 cmd :
                     assign :
-                        active_testsuite_remote_host : [testsuite-remote-3.digium.internal, public1, ipv4]
+                        active_testsuite_remote_host : [testsuite-remote-10.digium.internal, public1, ipv4]
                         standby_testsuite_remote_host : [testsuite-remote-4.digium.internal, public1, ipv4]
                         address_pool : failover_pool_1
                         shared_ip_label : failover-shared-ip-1
             - asteriskscf_icebox :
+                service_locator : [testsuite-remote-1.digium.internal, public1, ipv4]
                 remote_agent : [testsuite-remote-1.digium.internal, public1, ipv4]
                 cmd :
                     start :
@@ -33,7 +34,7 @@ tests :
                         mode : failover
             - asteriskscf_icebox :
                 service_locator : [testsuite-remote-1.digium.internal, public1, ipv4]
-                remote_agent : [testsuite-remote-3.digium.internal, public1, ipv4]
+                remote_agent : [testsuite-remote-10.digium.internal, public1, ipv4]
                 shared_addr : [failover-shared-ip-1, public1, ipv4]
                 cmd :
                     start :
@@ -49,6 +50,14 @@ tests :
                         components :
                             - SIPServiceStandby
                         mode : failover
+            - asteriskscf_activator :
+                discovery_replica_host : [testsuite-remote-1.digium.internal, public1, ipv4]
+                service_locator_host : [testsuite-remote-1.digium.internal, public1, ipv4]
+                cmd :
+                    activate :
+                        replica_name : SIPSessionManager.Replica
+                        instance_id : SIPServiceActive
+                        service_name : default
             - asteriskscf_configurator :
                 service_locator_host : [testsuite-remote-1.digium.internal, public1, ipv4]
                 configuration_wipe : False
@@ -87,14 +96,6 @@ tests :
                             startport : 10001
                             endport : 20000
                             workerthreadcount : 4
-            - asteriskscf_activator :
-                discovery_replica_host : [testsuite-remote-1.digium.internal, public1, ipv4]
-                service_locator_host : [testsuite-remote-1.digium.internal, public1, ipv4]
-                cmd : 
-                    activate : 
-                        replica_name : SIPSessionManager.Replica
-                        instance_id : SIPServiceActive
-                        service_name : default
             - sipp:
                 remote_agent : [testsuite-remote-5.digium.internal, public1, ipv4]
                 cmd :
@@ -116,7 +117,7 @@ tests :
             - failover :
                 cmd :
                     failover :
-                        active_testsuite_remote_host : [testsuite-remote-3.digium.internal, public1, ipv4]
+                        active_testsuite_remote_host : [testsuite-remote-10.digium.internal, public1, ipv4]
                         standby_testsuite_remote_host : [testsuite-remote-4.digium.internal, public1, ipv4]
                         address_pool : failover_pool_1
                         shared_ip_label : failover-shared-ip-1
diff --git a/tests/asteriskscf/failover/tests.yaml b/tests/asteriskscf/failover/tests.yaml
index 2124910..1647afa 100644
--- a/tests/asteriskscf/failover/tests.yaml
+++ b/tests/asteriskscf/failover/tests.yaml
@@ -5,9 +5,10 @@ docs :
     template : generic
     overview : 'SIP overview goes here'
 testcase :
+    - media_transport_udptl
     - service_discovery
-#    - sip
-#    - bridge
-#    - routing
-#    - media_rtp
-#    - media_ops_core
+    - sip
+    - bridge
+    - routing
+    - media_rtp
+    - media_ops_core

commit 5df4f7cb8724c0886730d9b7e1752ccd8678424e
Author: Darren Sessions <dsessions at digium.com>
Date:   Wed May 9 13:10:58 2012 -0500

    updated the failover shared ip addresses due to our original block being reassigned by IT

diff --git a/configs/server/remoteAgents.yaml b/configs/server/remoteAgents.yaml
index ed0c7ed..7695cae 100644
--- a/configs/server/remoteAgents.yaml
+++ b/configs/server/remoteAgents.yaml
@@ -1,7 +1,7 @@
 - galway.digium.internal
 - testsuite-remote-1.digium.internal
-#- testsuite-remote-2.digium.internal
-#- testsuite-remote-3.digium.internal
+- testsuite-remote-2.digium.internal
+- testsuite-remote-3.digium.internal
 - testsuite-remote-4.digium.internal
 - testsuite-remote-5.digium.internal
 - testsuite-remote-6.digium.internal
diff --git a/lib/python/Misc.py b/lib/python/Misc.py
index c6f507e..94af1b3 100644
--- a/lib/python/Misc.py
+++ b/lib/python/Misc.py
@@ -89,7 +89,7 @@ class Utils():
         return app
 
     def hostLabelResolver(self, hostList):
-        globalVars.remoteInfo['failover-shared-ip-1'] = {'ifaceInfo':{'public1':{'ipv4':'10.19.139.44'}}}
+        globalVars.remoteInfo['failover-shared-ip-1'] = {'ifaceInfo':{'public1':{'ipv4':'10.19.136.15'}}}
         try:
             globalVars.remoteInfo[hostList[0]]
         except:
diff --git a/plugins/asteriskscf_icebox.py b/plugins/asteriskscf_icebox.py
index 056b82a..020ed4b 100644
--- a/plugins/asteriskscf_icebox.py
+++ b/plugins/asteriskscf_icebox.py
@@ -68,7 +68,7 @@ class plugin(Plugin.BaseClass):
                     res['data'] = res['data'].replace('!!PRIVATE!!', '-h %s' % remote_agent_ip)
 
                     if 'shared_addr' in testData['cmd']:
-                        res['data'] = res['data'].replace('!!PUBLIC!!', '-h 10.19.139.44')
+                        res['data'] = res['data'].replace('!!PUBLIC!!', '-h 10.19.136.15')
                     else:
                         res['data'] = res['data'].replace('!!PUBLIC!!', '')
 
diff --git a/plugins/failover.py b/plugins/failover.py
index 94196fb..ecd87b0 100644
--- a/plugins/failover.py
+++ b/plugins/failover.py
@@ -24,7 +24,7 @@ class plugin(Plugin.BaseClass):
             'failover_pool_1' : { 
                 'ipv4' :
                     [
-                        {'10.19.139.44' : {
+                        {'10.19.136.15' : {
                             'network' : '10.19.136.0',
                             'netmask' : '255.255.252.0',
                             'broadcast' : '10.19.139.255'}}

commit 6e5373028c57851ddacf489d66291109bb16aba5
Author: Darren Sessions <dsessions at digium.com>
Date:   Wed May 9 13:05:04 2012 -0500

    Finished cleaning up the old bamboo files that were moved a long time ago.

diff --git a/bamboo/Makefile b/bamboo/Makefile
deleted file mode 100644
index aea40b6..0000000
--- a/bamboo/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-INSTALL=install
-
-BINDIR=/opt/bamboo
-
-all:
-	@echo "***********************************************************"
-	@echo "***" 
-	@echo "** Run \"make install\" to install build scripts."
-	@echo "**" 
-	@echo "***********************************************************"
-
-install:
-	@test -d $(BINDIR) || \
-		mkdir -p $(BINDIR)
-	@for f in bin/*; do \
-		test -f $$f && \
-		chmod 755 $$f && \
-		cp -p $$f $(BINDIR); \
-	done
diff --git a/bamboo/Makefile.mak b/bamboo/Makefile.mak
deleted file mode 100644
index 2cd7a70..0000000
--- a/bamboo/Makefile.mak
+++ /dev/null
@@ -1,13 +0,0 @@
-INSTALL=copy
-
-BINDIR=C:\bamboo
-
-all:
-	@echo "************************************************************"
-	@echo "***" 
-	@echo "*** Run \"make install\" to install build scripts."
-	@echo "***" 
-	@echo "************************************************************"
-
-install:
-	for %n in (bin\*.*) do $(INSTALL) %n $(BINDIR)
diff --git a/bamboo/bin/boost_to_junit.xsl b/bamboo/bin/boost_to_junit.xsl
deleted file mode 100644
index 6e77b2d..0000000
--- a/bamboo/bin/boost_to_junit.xsl
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Boost.Test XML to J-Unit XML 
- XSL Transformation Stylesheet 
-
- Asterisk SCF Test-Suite
- Copyright (C) 2011, Digium, Inc.
-   
- Darren Sessions <dsessions at digium.com>
-
- This program is free software, distributed under the terms of
- the GNU General Public License Version 2.
-
--->
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-    <xsl:template match="TestResult">
-        <xsl:call-template name="testSuite" />
-    </xsl:template>
-
-    <xsl:template name="testSuite">
-        <xsl:for-each select="TestSuite">
-            <testsuite>
-                <xsl:attribute name="skipped">
-                    <xsl:value-of select="@test_cases_skipped"/>
-                </xsl:attribute>
-                <xsl:attribute name="not-run">
-                    <xsl:value-of select="@test_cases_skipped"/>
-                </xsl:attribute>
-                <xsl:attribute name="failures">
-                    <xsl:value-of select="@test_cases_failed"/>
-                </xsl:attribute>
-                <xsl:attribute name="expected_failures">
-                    <xsl:value-of select="@test_cases_expected_failures"/>
-                </xsl:attribute>
-                <xsl:attribute name="errors">
-                    <xsl:value-of select="@test_cases_failed + @test_cases_aborted"/>
-                </xsl:attribute>
-                <xsl:attribute name="tests">
-                    <xsl:value-of select="@test_cases_passed + @test_cases_failed + @test_cases_expected_failures + @test_cases_skipped + @test_cases_aborted"/>
-                </xsl:attribute>
-                <xsl:call-template name="testAttributes" />
-                <xsl:call-template name="testSuite" />
-                <xsl:for-each select="TestCase">
-                    <testcase>
-                        <xsl:call-template name="testAttributes" />
-                        <xsl:call-template name="testCaseElements" />
-                    </testcase>
-                 </xsl:for-each>
-            </testsuite>
-        </xsl:for-each>
-    </xsl:template>
-
-    <xsl:template name="testAttributes">
-        <xsl:attribute name="name">
-            <xsl:value-of select="@name"/>
-        </xsl:attribute>
-        <xsl:attribute name="success">
-            <xsl:choose>
-                <xsl:when test="@result = 'passed'">True</xsl:when>
-                <xsl:when test="@result != 'passed'">False</xsl:when>
-            </xsl:choose>
-        </xsl:attribute>
-        <xsl:attribute name="executed">True</xsl:attribute>
-        <xsl:attribute name="time">0</xsl:attribute>
-        <xsl:attribute name="expected_failures">0</xsl:attribute>
-        <xsl:attribute name="asserts">
-            <xsl:value-of select="@assertions_failed + @assertions_passed"/>
-        </xsl:attribute>
-    </xsl:template>
-
-    <xsl:template name="testCaseElements">
-        <xsl:if test="@result != 'passed'">
-            <failure type="A failure type was not reported." message="No message was reported."/>
-        </xsl:if>
-    </xsl:template>
-
-    <xsl:output method="xml" indent="yes"/>
-</xsl:stylesheet>
diff --git a/bamboo/bin/tests.py b/bamboo/bin/tests.py
deleted file mode 100644
index f0124f6..0000000
--- a/bamboo/bin/tests.py
+++ /dev/null
@@ -1,290 +0,0 @@
-#!/usr/bin/env python
-'''
-
- Build and unit-test engine for Atlassian Bamboo
-
- Asterisk SCF Test-Suite 
- Copyright (C) 2011, Digium, Inc.
-   
- Darren Sessions <dsessions at digium.com>
-
- This program is free software, distributed under the terms of
- the GNU General Public License Version 2.
-
-'''
-
-import os
-import re
-import sys
-import time
-import platform
-import optparse
-import subprocess
-
-from xml.dom.minidom import Document
-
-class test_asterisk_scf:
-    def __init__(self, component, unittests=None):
-        self._component = component
-        self._unittests = unittests
-        self._msbuild_path = "/Windows/Microsoft.NET/Framework/v4.0.30319/MSBuild.exe"
-        self.__build()
-        
-        if self._unittests:
-            self.__unit_tests(component)
-            self.__write_results_xml(component)
-            self.__convert_boost_to_junit()
-
-    def __convert_boost_to_junit(self):
-        os.chdir("../test_results")
-        tree = os.walk(".")
-        for root, dirs, files in tree:
-            if len(files)>0:
-                for f in files:
-                    if re.match(r"^(?!converted).*result.xml", f):
-                        os.system("%s /opt/bamboo/boost_to_junit.xsl %s >> ../converted_%s" % (which("xsltproc"), f, f))
-                        os.remove(f)
-
-    def __unit_tests(self, component):
-        self.total_failures = 0
-        self.total_time = 0
-        self.tests = 0
-        self.passed = 1
-        self.did_run = True
-        
-        if not os.path.exists("./build/%s" % component):
-            print "Unable to find the test directory for the '%s' component!" % component
-            return
-
-        os.chdir("./build/%s" % component)
-        start_time = time.time()
-        self.passed = uni_make(None, None, 'test')
-        self.total_time = time.time() - start_time
-
-        if self.passed != 0:
-            self.total_failures = 1
-        self.tests = 1
-
-    def __write_results_xml(self, component): 
-        try:
-            f = open("../%s_master_unit_test_results.xml" % component, "w")
-        except IOError:
-            print "Failed to open test results output file: "
-            return
-        except:
-            print "Unexpected error: %s" % sys.exc_info()[0]
-            return
-
-        f.write('<?xml version="1.0" encoding="UTF-8"?>\n')
-        f.write('<testsuite errors="0" tests="%s" time="%.2f" failures="%d" '
-                'name="Asterisk SCF Test-Suite">\n' %
-                (self.tests, self.total_time, self.total_failures))
-        f.write('\t<testcase time="%.2f" name="%s unit tests"' % (self.total_time, component))
-        if self.passed == 0:
-            f.write('/>\n')
-        else:
-            f.write(">\n\t\t<failure />")
-            f.write("\n\t</testcase>\n")
-        f.write('</testsuite>\n')
-        f.close()
-
-        try:
-            f = open("../%s_master_unit_test_results.xml" % component, "r")
-        except IOError:
-            print "Failed to open test results output file:"
-        except:
-            print "Unexpected error: %s" % sys.exc_info()[0]
-        else:
-            print f.read()
-            f.close()
-
-    def __build(self):
-        if os.path.exists("./gitall"):
-             errorout("'gitall' already exists!")
-
-        os.system("git clone git://git.asterisk.org/asterisk-scf/integration/gitall")
-        os.chdir("./gitall") 
-        os.system("bash ./gitall-asterisk-scf.sh")
-
-        if self._component == "gitall":
-            cloned_rev = readinfile(".git/refs/heads/master").rstrip('\n')
-        else:
-            cloned_rev = readinfile("%s/.git/refs/heads/master" % self._component).rstrip('\n')
-
-        print "\n\nTest build initiated for: %s" % self._component
-        print "-----------------\nBamboo revision = %s\nCloned revision = %s\n-----------------\n" % (crev, cloned_rev)
-    
-        if crev != cloned_rev:
-            print "Reverting to %s" % crev
-            if self._component != "gitall":
-                os.chdir("./%s" % self._component)
-            os.system("git checkout %s" % crev)
-            os.chdir("..")
-
-        if plat == "Windows":
-            system_call(["/cygwin/bin/bash.exe","./cmake/init-cmake.sh","--nmake"])
-            os.chdir("./pjproject/pjlib/build")
-            system_call(["%s" % self._msbuild_path, "pjlib.vcxproj"])
-            os.chdir("../../pjlib-util/build")
-            system_call(["%s" % self._msbuild_path, "pjlib_util.vcxproj"])
-            os.chdir("../../pjmedia/build")
-            system_call(["%s" % self._msbuild_path, "pjmedia.vcxproj"])
-            system_call(["%s" % self._msbuild_path, "pjmedia_audiodev.vcxproj"])
-            os.chdir("../../third_party/build/srtp")
-            system_call(["%s" % self._msbuild_path, "libsrtp.vcxproj"])
-            os.chdir("../../../pjnath/build")
-            system_call(["%s" % self._msbuild_path, "pjnath.vcxproj"])
-            os.chdir("../../pjsip/build")
-            system_call(["%s" % self._msbuild_path, "pjsip_simple.vcxproj"])
-            system_call(["%s" % self._msbuild_path, "pjsip_ua.vcxproj"])
-            system_call(["%s" % self._msbuild_path, "pjsip_core.vcxproj"])
-            system_call(["%s" % self._msbuild_path, "pjsua_lib.vcxproj"])
-            os.chdir("../../../build")
-            uni_make(None, None, None)
-            os.chdir("..")
-            sys.exit(0)
-        else:
-            system_call(["/bin/bash","./cmake/init-cmake.sh"])
-            system_call(["/usr/bin/cmake","--build","./build"])
-
-def system_call(cmd):
-    if os.path.exists(cmd[0]) and os.access(cmd[0], os.X_OK):
-        p = subprocess.Popen(cmd)
-        p.wait()
-        if p.returncode != 0:
-            errorout("Error detected during system call! '%s' returned with exit code: %d" % (cmd[0], p.returncode))
-        return p.returncode
-    else:
-        errorout("FAILED TO EXECUTE %s, it must exist and be executable" % cmd)
-
-def which(app):
-    def if_exists(file_path):
-        return os.path.exists(file_path) and os.access(file_path, os.X_OK)
-
-    file_path, file_name = os.path.split(app)
-    if file_path:
-        if if_exists(app):
-            return app
-    else:
-        for path in os.environ["PATH"].split(os.pathsep):
-            prog = os.path.join(path, app)
-            if if_exists(prog):
-                return prog
-    return 
-
-def test_ice():
-    print "\n\nBuilding Ice\n"
-    os.chdir("./cpp")
-    uni_make(1, 1, 'install')
-    sys.exit(0)
-
-def test_slice_plugins():
-    print "\n\nBuilding Slice Plugins\n"
-    os.system("cmake .")
-    uni_make(None, None, 'install')
-    sys.exit(0)
-
-def uni_make(makefile=None,makeargs=None,makesubtype=None):
-    sc = []
-    if plat == "Windows":
-        if makefile:
-            sc = ["%s" % make,"-F","Makefile.mak"]
-        else:
-            sc = ["%s" % make]
-        rc = system_call(sc)
-    elif plat == "SunOS":
-        if makeargs:
-            sc = ["%s" % make,"MCPP_HOME=/usr/local EXPAT_HOME=/usr/sfw OPENSSL_HOME=/usr/sfw DB_HOME=/usr/local/BerkeleyDB.4.8"]
-        else:
-            sc = ["%s" % make]
-        rc = system_call(sc)
-    else:
-        sc = ["%s" % make] 
-        rc = system_call(sc)
-    if makesubtype and rc == 0:
-        sc.append(makesubtype)
-        rc = system_call(sc)
-    return rc
-
-def readinfile(file):
-    try:
-        f = open(file, "r")
-    except IOError:
-        errorout("Failed to open file: %s" % file)
-    except:
-        errorout("Unexpected error: %s" % sys.exc_info()[0])
-    else:
-        rc = f.read()
-        f.close()
-    return rc
-
-def errorout(msg):
-    dash = ""
-    while len(dash) < len(msg):
-        dash = dash + "!"
-    print dash + "\n" + msg + "\n" + dash + "\n"
-    sys.exit(1)
-
-def update_build_env():
-    os.chdir('bamboo')
-    uni_make(1, None, 'install')
-    return 
-
-def main(argv=None):
-    global plat
-    global arch
-    global make
-    global mkcmd
-    global crev
-
-    if argv is None:
-        args = sys.argv
-    
-    try:
-        args[1]
-    except:
-        errorout("Usage: ./tests.py [component] [unittests]")
-
-    try:
-        args[2]
-        unittests = 'unittests'
-    except:
-        unittests = ''
-
-    arch = platform.machine()
-    plat = platform.system()
-    
-    if plat == "Windows":
-        make = '/PROGRA~1/MICROS~1.0/VC/bin/nmake.exe'
-        rmdircmd = "rmdir /S /Q"
-    elif plat == "SunOS":
-        make = "/usr/bin/gmake"
-        rmdircmd = "rm -rf"
-    else:
-        make = "/usr/bin/make"
-        rmdircmd = "rm -rf"
-
-    print "-------------------------------------------------------------------------\n"
-    print "-------------------------------------------------------------------------\n\n"
-    print "Running on %s %s\n" % (plat, arch) 
-    print "\n"
-    for param in os.environ.keys():
-        print "%20s %s" % (param, os.environ[param])
-    print "\n"
-    print "-------------------------------------------------------------------------\n"
-    print "-------------------------------------------------------------------------\n\n"
-
-    if args[1] == "ice":
-        test_ice()
-    elif args[1] == "slice-plugins":
-        test_slice_plugins()
-    elif args[1] == "update_build_env":
-        update_build_env()        
-    else:
-        crev = readinfile(".git/refs/heads/master").rstrip('\n')
-        test_asterisk_scf(args[1], unittests)
-
-    return 0
-
-if __name__ == "__main__":
-    sys.exit(main() or 0)
diff --git a/bamboo/bin/visual_studio_wrapper.bat b/bamboo/bin/visual_studio_wrapper.bat
deleted file mode 100644
index 78fb10d..0000000
--- a/bamboo/bin/visual_studio_wrapper.bat
+++ /dev/null
@@ -1,38 +0,0 @@
- at ECHO off
-REM
-REM  Asterisk SCF build and unit-test engine for Atlassian Bamboo
-REM 
-REM  Copyright (C) 2011, Digium, Inc.
-REM   
-REM  Darren Sessions <dsessions at digium.com>
-REM
-REM  This program is free software, distributed under the terms of
-REM  the GNU General Public License Version 2.
-REM
-
-if "%1" == "" goto usage
-if "%2" == "" goto usage
-
- at call "C:\Program Files\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" %1 
-
-SET BINDIR=C:\bamboo
-SET CPP_COMPILER=VC100_EXPRESS
-
-%BINDIR%\tests.py %2 %3
-
-goto :eof
-
-:usage
-ECHO:
-ECHO Error in script usage. The correct usage is:
-ECHO     %0 [arch] [asterisk scf repo] (unittests)
-ECHO:
-ECHO where [arch] is: x86 ^| amd64
-ECHO     and
-ECHO where [asterisk scf repo] is an Asterisk SCF git repository.
-ECHO:
-ECHO For example:
-ECHO     %0 x86 sip
-
-goto :eof
-
diff --git a/bamboo/contrib/init.d/com.atlassian.BambooAgent.plist b/bamboo/contrib/init.d/com.atlassian.BambooAgent.plist
deleted file mode 100644
index 8d354d9..0000000
--- a/bamboo/contrib/init.d/com.atlassian.BambooAgent.plist
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-	<dict>
-		<key>Disabled</key>
-		<false/>
-		<key>Label</key>
-		<string>com.atlassian.BambooAgent</string>
-		<key>ProgramArguments</key>
-		<array>
-			<string>/var/root/bin/bamboo-agent.sh</string>
-			<string>start</string>
-		</array>
-		<key>ServiceDescription</key>
-		<string>Atlassian Bamboo build agent</string>
-		<key>UserName</key>
-		<string>root</string>
-		<key>GroupName</key>
-		<string>admin</string>
-		<key>OnDemand</key>
-		<false/>
-	</dict>
-</plist>
diff --git a/bamboo/contrib/init.d/rc.debian.bamboo-remote-agent b/bamboo/contrib/init.d/rc.debian.bamboo-remote-agent
deleted file mode 100644
index 8f63edb..0000000
--- a/bamboo/contrib/init.d/rc.debian.bamboo-remote-agent
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-
-### BEGIN INIT INFO
-# Provides:		bamboo-remote-agent
-# Required-Start:	$local_fs $remote_fs $network $syslog
-# Required-Stop:	$local_fs $remote_fs $network $syslog
-# Default-Start:	2 3 4 5
-# Default-Stop:		0 1 6
-# Short-Description:	Bamboo Remote Agent
-### END INIT INFO
-
-case $1 in
-	start)
-		/srv/bamboo/bin/bamboo-agent.sh start
-		;;
-	stop)
-		/srv/bamboo/bin/bamboo-agent.sh stop
-		;;
-	restart)
-		/srv/bamboo/bin/bamboo-agent.sh restart
-		;;
-	*)
-		echo "Usage: $0 {start|stop|restart}"
-		exit 1
-		;;
-esac
-
-exit 0
diff --git a/bamboo/contrib/init.d/rc.redhat.bamboo-remote-agent b/bamboo/contrib/init.d/rc.redhat.bamboo-remote-agent
deleted file mode 100644
index d12c579..0000000
--- a/bamboo/contrib/init.d/rc.redhat.bamboo-remote-agent
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-#
-# bamboo-remote-agent:    Start/stop Bamboo remote agent
-#
-# chkconfig:    2345 90 60
-# description:  Bamboo Remote Agent
-
-case "$1" in
-	start)
-		/srv/bamboo/bin/bamboo-agent.sh start
-		;;
-	stop)
-		/srv/bamboo/bin/bamboo-agent.sh stop
-		;;
-	restart)
-		/srv/bamboo/bin/bamboo-agent.sh restart
-		;;
-	*)
-		echo $"Usage: $0 {start|stop|restart}"
-		exit 1
-		;;
-esac
-
-exit 0

-----------------------------------------------------------------------


-- 
asterisk-scf/release/testsuite.git



More information about the asterisk-scf-commits mailing list