Merge lp:~jacekn/mojo/mojo-specs into lp:mojo/mojo-specs

Proposed by Jacek Nykis
Status: Merged
Approved by: Laurent Sesquès
Approved revision: no longer in the source branch.
Merged at revision: 119
Proposed branch: lp:~jacekn/mojo/mojo-specs
Merge into: lp:mojo/mojo-specs
Diff against target: 93 lines (+71/-0)
4 files modified
charm-testing/prometheus-openstack-exporter/collect (+2/-0)
charm-testing/prometheus-openstack-exporter/deploy (+21/-0)
charm-testing/prometheus-openstack-exporter/manifest (+27/-0)
charm-testing/prometheus-openstack-exporter/post-deploy (+21/-0)
To merge this branch: bzr merge lp:~jacekn/mojo/mojo-specs
Reviewer Review Type Date Requested Status
Laurent Sesquès Approve
Review via email: mp+349931@code.launchpad.net

Commit message

Add stage for prometheus-openstack-exporter charm testing

To post a comment you must log in.
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

Revision history for this message
Laurent Sesquès (sajoupa) :
review: Approve
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision 119

lp:~jacekn/mojo/mojo-specs updated
119. By Jacek Nykis

Add stage for prometheus-openstack-exporter charm testing

Reviewed-on: https://code.launchpad.net/~jacekn/mojo/mojo-specs/+merge/349931
Reviewed-by: Laurent Sesques <email address hidden>

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== added directory 'charm-testing/prometheus-openstack-exporter'
=== added file 'charm-testing/prometheus-openstack-exporter/collect'
--- charm-testing/prometheus-openstack-exporter/collect 1970-01-01 00:00:00 +0000
+++ charm-testing/prometheus-openstack-exporter/collect 2018-07-19 12:42:46 +0000
@@ -0,0 +1,2 @@
1prometheus-openstack-exporter cs:prometheus-openstack-exporter
2nrpe cs:nrpe
03
=== added file 'charm-testing/prometheus-openstack-exporter/deploy'
--- charm-testing/prometheus-openstack-exporter/deploy 1970-01-01 00:00:00 +0000
+++ charm-testing/prometheus-openstack-exporter/deploy 2018-07-19 12:42:46 +0000
@@ -0,0 +1,21 @@
1prometheus-openstack-exporter:
2 series: {{series}}
3 services:
4 prometheus-openstack-exporter:
5 charm: prometheus-openstack-exporter
6 options:
7 cache-refresh-interval: 90
8 schedulable-instance-size: 2, 4096, 40
9 os-credentials: |
10 { username: "dummy_user", password: "dummy_password",
11 tenant_name: "dummy_tenant", region_name: "dummy_region",
12 auth_url: "http://localhost" }
13 nrpe:
14 charm: nrpe
15{%- if series != "trusty" %}
16 options:
17 procs: '-w 200 -c 250 -k'
18 swap: '-w 90% -c 75% -n ok'
19{%- endif %}
20 relations:
21 - ["prometheus-openstack-exporter", "nrpe:nrpe-external-master"]
022
=== added symlink 'charm-testing/prometheus-openstack-exporter/helpers'
=== target is u'../prometheus2/helpers'
=== added file 'charm-testing/prometheus-openstack-exporter/manifest'
--- charm-testing/prometheus-openstack-exporter/manifest 1970-01-01 00:00:00 +0000
+++ charm-testing/prometheus-openstack-exporter/manifest 2018-07-19 12:42:46 +0000
@@ -0,0 +1,27 @@
1# Collect, pre-deploy (lint, etc.) deploy and check the initial charm
2# We need to clean the build directory first in case a previous build
3# was using a version that is different from the upstream (e.g. git vs. charmstore)
4script config=clean-build-dir
5# Now collect
6collect config=collect
7script config=pre-deploy
8deploy config=deploy wait=true
9# Skip check_prometheus_openstack_exporter_http as it requires valid admin creds to work
10nagios-check skip-checks='check_swap,check_etc_bzr,check_log_archive_status,check_ksplice,check_prometheus_openstack_exporter_http' retry=3 sleep=60
11verify config=post-deploy retry=3 sleep=60
12# Now test an upgrade to the new charm if UPGRADE_CHARM is set
13stop-on return-code=99 config=check-upgrade-charm UPGRADE_CHARM=${UPGRADE_CHARM}
14script config=create-upgrade-collect UPGRADE_CHARM=${UPGRADE_CHARM}
15collect config=collect-upgrade
16script config=upgrade-charm
17juju-check-wait
18# Skip check_prometheus_openstack_exporter_http as it requires valid admin creds to work
19nagios-check skip-checks='check_swap,check_etc_bzr,check_log_archive_status,check_ksplice,check_prometheus_openstack_exporter_http' retry=3 sleep=60
20verify config=post-deploy retry=3 sleep=60
21# Now redeploy the model, and test a deployment from scratch (with the updated charm in place)
22script config=redeploy-model
23script config=pre-deploy
24deploy config=deploy wait=true
25# Skip check_prometheus_openstack_exporter_http as it requires valid admin creds to work
26nagios-check skip-checks='check_swap,check_etc_bzr,check_log_archive_status,check_ksplice,check_prometheus_openstack_exporter_http' retry=3 sleep=60
27verify config=post-deploy retry=3 sleep=60
028
=== added file 'charm-testing/prometheus-openstack-exporter/post-deploy'
--- charm-testing/prometheus-openstack-exporter/post-deploy 1970-01-01 00:00:00 +0000
+++ charm-testing/prometheus-openstack-exporter/post-deploy 2018-07-19 12:42:46 +0000
@@ -0,0 +1,21 @@
1#!/bin/bash
2
3. "$(dirname $0)/helpers"
4
5##################################
6# prometheus-openstack-exporter verification
7##################################
8for UNIT in $(get_units prometheus-openstack-exporter); do
9 echo -e "####\n# Calling unit to ensure it returns metrics"
10 # Due to LP#1782563 we need to ssh to the unit to verify
11 #curl -f -s -S -v http://${UNIT}:9183 |grep OpenStack
12 ssh ${UNIT} "curl -f -s -S -v http://localhost:9183/|grep OpenStack"
13 if [ $? -ne 0 ]; then
14 fail
15 fi
16done
17
18# If we are here it means all checks passed
19echo "#####################"
20echo "# E2E Checks Passed #"
21echo "#####################"

Subscribers

People subscribed via source and target branches

to all changes: