Merge lp:~1chb1n/charms/trusty/hacluster/amulet-extend into lp:~openstack-charmers/charms/trusty/hacluster/next

[Ryan Beisner]

amulet test update: switch vip env var name to be consistent with other os-charm tests; change make target names to be consistent with other os-charm tests and bundletester expectations.

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #6718 hacluster-next for 1chb1n mp266355
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/6718/

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #7258 hacluster-next for 1chb1n mp266355
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/7258/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #5491 hacluster-next for 1chb1n mp266355
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [functional_test] Error 1
ERROR:root:Make target returned non-zero.

Full amulet test output: http://paste.ubuntu.com/11964448/
Build: http://10.245.162.77:8080/job/charm_amulet_test/5491/

[lp:~1chb1n/charms/trusty/hacluster/amulet-extend]

54. By Ryan Beisner on 2015-07-30

remove t-j, t-k test targets, charm does not support openstack-origin.

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #6719 hacluster-next for 1chb1n mp266355
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/6719/

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #7260 hacluster-next for 1chb1n mp266355
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/7260/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #5494 hacluster-next for 1chb1n mp266355
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [functional_test] Error 1
ERROR:root:Make target returned non-zero.

Full amulet test output: http://paste.ubuntu.com/11964755/
Build: http://10.245.162.77:8080/job/charm_amulet_test/5494/

[Ryan Beisner (1chb1n)]

Bahh. Punting. Let's just unblock tests for Trusty for now.

[lp:~1chb1n/charms/trusty/hacluster/amulet-extend]

55. By Ryan Beisner on 2015-07-30

remove vivid test re: bug 1479661

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #7261 hacluster-next for 1chb1n mp266355
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/7261/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #6721 hacluster-next for 1chb1n mp266355
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/6721/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #5496 hacluster-next for 1chb1n mp266355
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/5496/

[Corey Bryant (corey.bryant)]

review: Approve

=== modified file 'Makefile'
--- Makefile	2015-03-31 11:12:57 +0000
+++ Makefile	2015-07-30 07:49:17 +0000
@@ -5,20 +5,18 @@
 	@flake8 --exclude hooks/charmhelpers hooks unit_tests tests
 	@charm proof
 
-unit_test:
+test:
+	@# Bundletester expects unit tests here.
 	@echo Starting unit tests...
 	@$(PYTHON) /usr/bin/nosetests --nologcapture --with-coverage  unit_tests
 
-test:
+functional_test:
 	@echo Starting Amulet tests...
-ifndef OS_CHARMS_AMULET_VIP
-	@echo "WARNING: HA tests require OS_CHARMS_AMULET_VIP set to usable vip address"
+ifndef AMULET_OS_VIP
+	@echo "ERROR: HA tests require AMULET_OS_VIP set to usable vip address"
+	@exit 1
 endif
-	# coreycb note: The -v should only be temporary until Amulet sends
-	# raise_status() messages to stderr:
-	#   https://bugs.launchpad.net/amulet/+bug/1320357
-	@juju test -v -p AMULET_HTTP_PROXY,OS_CHARMS_AMULET_VIP --timeout 900 \
-		00-setup 15-basic-trusty-icehouse
+	@juju test -v -p AMULET_HTTP_PROXY,AMULET_OS_VIP --timeout 2700
 
 bin/charm_helpers_sync.py:
 	@mkdir -p bin

=== modified file 'metadata.yaml'
--- metadata.yaml	2015-02-11 23:49:44 +0000
+++ metadata.yaml	2015-07-30 07:49:17 +0000
@@ -4,7 +4,7 @@
 subordinate: true
 description: |
  Corosync/Pacemaker
-categories:
+tags:
  - misc
 requires:
   juju-info:

=== renamed file 'tests/15-basic-trusty-icehouse' => 'tests/015-basic-trusty-icehouse'
=== modified file 'tests/basic_deployment.py'
--- tests/basic_deployment.py	2015-07-29 17:23:39 +0000
+++ tests/basic_deployment.py	2015-07-30 07:49:17 +0000
@@ -24,7 +24,7 @@
         """Deploy the entire test environment."""
         super(HAClusterBasicDeployment, self).__init__(series, openstack,
                                                        source, stable)
-        env_var = 'OS_CHARMS_AMULET_VIP'
+        env_var = 'AMULET_OS_VIP'
         self._vip = os.getenv(env_var, None)
         if not self._vip:
             amulet.raise_status(amulet.SKIP, msg="No vip provided with '%s' - "