Merge lp:~checkbox-dev/checkbox/checkbox-charm into lp:checkbox

[Ashley Lai]

Checkbox charm merged from lp:~alai/charms/trusty/checkbox/trunk.

[Daniel Manrique (roadmr)]

Hello! OK, I see there are some merge conflicts here. You mentioned you wanted this to live in lp:~checkbox-dev/checkbox/checkbox-charm. If that's the case, you can try to simply bzr push lp:~checkbox-dev/checkbox/checkbox-charm.

If instead you want this to be part of lp:checkbox, you'd have to redo your merge request and I would suggest putting the charm in support/charm.

Let me know if there are any questions on how to do any of this.

Thanks for contributing this charm!

review: Needs Fixing

[Jeff Lane  (bladernr)]

The idea (the one I suggested at least) was to have a separate project
part of checkbox, hence, hosting it at checkbox/checkbox-charm the
same way we host things like the packaging and legacy branches.

OR, do you think there's a better way? The desired end-goal is to get
this into Launchpad in a Certification space so both our teams (and
anyone else) can try it, file bugs and so forth. Open to suggestions.

On Tue, Sep 16, 2014 at 4:00 PM, Daniel Manrique
<email address hidden> wrote:
> Review: Needs Fixing
>
> Hello! OK, I see there are some merge conflicts here. You mentioned you wanted this to live in lp:~checkbox-dev/checkbox/checkbox-charm. If that's the case, you can try to simply bzr push lp:~checkbox-dev/checkbox/checkbox-charm.
>
> If instead you want this to be part of lp:checkbox, you'd have to redo your merge request and I would suggest putting the charm in support/charm.
>
> Let me know if there are any questions on how to do any of this.
>
> Thanks for contributing this charm!
> --
> https://code.launchpad.net/~checkbox-dev/checkbox/checkbox-charm/+merge/234881
> Your team Checkbox Developers is subscribed to branch lp:~checkbox-dev/checkbox/checkbox-charm.

--
"Entropy isn't what it used to be."

Jeff Lane - Server Certification Team Lead, Tools Developer, Warrior
Poet, Lover of Pie
Phone: [phone]
Ubuntu Ham: W4KDH Freenode IRC: bladernr or bladernr_
gpg: 1024D/3A14B2DD 8C88 B076 0DD7 B404 1417 C466 4ABD 3635 3A14 B2DD

[lp:~checkbox-dev/checkbox/checkbox-charm]

5. By Ashley Lai on 2014-09-16

Update README

[Ashley Lai (alai)]

The idea is to have this charm lives in lp:~checkbox-dev/checkbox/checkbox-charm. I did bzr push lp:~checkbox-dev/checkbox/checkbox-charm and then proposed a merge. Please let me know the right way to do it and I can redo.

Thanks.

[Daniel Manrique (roadmr)]

OK, the way it is, it already lives in lp:~checkbox-dev/checkbox/checkbox-charm, and people can download it and contribute to it. As-is, it can't be merged into lp:checkbox because, as you saw, it would add files at the top level of lp:checkbox itself (essentially you'd be fusing the two projects, which doesn't look like something we want to do).

Reading Jeff's expectations, I guess the best thing to do would be to create a launchpad project for the charm (for comparison with checkbox-legacy which is here: https://launchpad.net/checkbox-legacy/). Then it can have bugs filed against it, and contributions can merge against (inventing here) lp:checkbox-charm, instead of fumbling with sub-branches of checkbox. To bring it into the checkbox family we can simply add it to the all-encompassing checkbox project (https://launchpad.net/checkbox-project).

Let me know if this makes sense, if not we can always try to find another option. A problem here is that I'm not up to speed on juju charm best practices as far as using launchpad to track them and the stuff they deploy, I guess you know more about this than I do.

[Zygmunt Krynicki (zyga)]

How about lp:checkbox-charm? We can still make that a part of
lp:checkbox-project but you could have your own merge requests and
bugs

On Tue, Sep 16, 2014 at 10:35 PM, Daniel Manrique
<email address hidden> wrote:
> OK, the way it is, it already lives in lp:~checkbox-dev/checkbox/checkbox-charm, and people can download it and contribute to it. As-is, it can't be merged into lp:checkbox because, as you saw, it would add files at the top level of lp:checkbox itself (essentially you'd be fusing the two projects, which doesn't look like something we want to do).
>
> Reading Jeff's expectations, I guess the best thing to do would be to create a launchpad project for the charm (for comparison with checkbox-legacy which is here: https://launchpad.net/checkbox-legacy/). Then it can have bugs filed against it, and contributions can merge against (inventing here) lp:checkbox-charm, instead of fumbling with sub-branches of checkbox. To bring it into the checkbox family we can simply add it to the all-encompassing checkbox project (https://launchpad.net/checkbox-project).
>
> Let me know if this makes sense, if not we can always try to find another option. A problem here is that I'm not up to speed on juju charm best practices as far as using launchpad to track them and the stuff they deploy, I guess you know more about this than I do.
> --
> https://code.launchpad.net/~checkbox-dev/checkbox/checkbox-charm/+merge/234881
> Your team Checkbox Developers is subscribed to branch lp:~checkbox-dev/checkbox/checkbox-charm.

Unmerged revisions

5. By Ashley Lai on 2014-09-16

Update README

4. By Ashley Lai on 2014-09-16

Add fixes from review comments

3. By Ashley Lai on 2014-09-03

Remove default option to run test

2. By Ashley Lai on 2014-08-26

Add more config and iperf

1. By Ashley Lai on 2014-06-18

Initial checkbox charm

=== added file 'README.md'
--- README.md	1970-01-01 00:00:00 +0000
+++ README.md	2014-09-16 20:11:39 +0000
@@ -0,0 +1,27 @@
+# Overview
+Checkbox is a hardware test tool that can be used to certify servers, desktops and laptops.  This charm will install the checkbox test tool  If the whitelist and secure ID is specified it will run the certification test and submit the results.
+
+# Installation
+To deploy this charm you will need at the minimum: a cloud environment, working juju installation and a successful bootstrap.  Once bootstrapped, deploy the checkbox and iperf charm.
+    juju deploy cs:~alai/checkbox
+    juju deploy cs:~alai/iperf
+
+# Configuration
+This charm provides configuration options for the following:
+    secure_id         - secure ID to submit the results (no default value)
+    whitelist   - whitelist to test (no default value)
+    output_path - path for output file submission.xml and the log (default value is /tmp)
+    iperf_target - IP address for the iperf target if not using the iperf charm
+
+Example to set the option:
+    juju set checkbox output_path=/home/ubuntu
+
+The secure_id can be configured if you wish to submit the results. 
+
+juju add-relation iperf checkbox
+
+# Contact Information
+Ashley Lai <[e-mail]>
+
+# Cerfification
+- [Canonical certification](https://certification.canonical.com/)

=== renamed file 'README.md' => 'README.md.moved'
=== added file 'config.yaml'
--- config.yaml	1970-01-01 00:00:00 +0000
+++ config.yaml	2014-09-16 20:11:39 +0000
@@ -0,0 +1,18 @@
+options:
+  secure_id:
+    type: string
+    default: "" 
+    description: secure ID to submit the certification results
+  whitelist:
+    type: string
+    default: "" 
+    description: path to whitelist
+  output_path:
+    type: string
+    default: /tmp 
+    description: path of output file submission.xml and the log
+  iperf_target:
+    type: string
+    default: ""
+    description: IP address for the iperf target if not using the iperf charm
+ 

=== added file 'copyright'
--- copyright	1970-01-01 00:00:00 +0000
+++ copyright	2014-09-16 20:11:39 +0000
@@ -0,0 +1,17 @@
+Format: http://dep.debian.net/deps/dep5/
+
+Files: *
+Copyright: Copyright 2014, Canonical Ltd., All Rights Reserved.
+License: GPL-3
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.

=== added directory 'hooks'
=== added file 'hooks/config-changed'
--- hooks/config-changed	1970-01-01 00:00:00 +0000
+++ hooks/config-changed	2014-09-16 20:11:39 +0000
@@ -0,0 +1,26 @@
+#!/bin/bash
+
+set -ex # If any command fails, stop execution of the hook with that error
+
+CONFIG_FILE="/etc/xdg/canonical-certification.conf"
+
+SECURE_ID=`config-get secure_id`
+RESULT_PATH=`config-get output_path`
+IPERF_TARGET=`config-get iperf_target`
+
+if [ "$IPERF_TARGET" != "" ]; then
+  sed -i '$ d' $CONFIG_FILE
+  echo "TEST_TARGET_IPERF =  $IPERF_TARGET" >> $CONFIG_FILE
+fi
+
+# Comment the submit feature for now as it will submit everytime 
+#   "juju set" is ran.  Will need to look into juju action.
+# Work around for bug 1370145.
+# /etc/sysctl.d/10-ipv6-privacy.conf contains funny apostrophe on line 3.
+# export LANG as in /etc/default/locale
+#export LANG="en_US.UTF-8"
+
+#if [ -f ${RESULT_PATH}/submission.xml ] && [ "$SECURE_ID" != "" ]; then
+#  echo "Submitting results.  Check ${RESULT_PATH}/certification-submit.log for status"
+#  canonical-certification-submit --url https://certification.canonical.com/submissions/submit/ ${SECURE_ID} ${RESULT_PATH}/submission.xml 2>&1 | tee ${RESULT_PATH}/certification-submit.log
+#fi

=== added file 'hooks/install'
--- hooks/install	1970-01-01 00:00:00 +0000
+++ hooks/install	2014-09-16 20:11:39 +0000
@@ -0,0 +1,14 @@
+#!/bin/bash
+# Here do anything needed to install the service
+# i.e. apt-get install -y foo  or  bzr branch http://myserver/mycode /srv/webroot
+# Make sure this hook exits cleanly and is idempotent, common problems here are
+# failing to account for a debconf question on a dependency, or trying to pull
+# from github without installing git first.
+
+set -e # If any command fails, stop execution of the hook with that error
+
+add-apt-repository ppa:hardware-certification/public 
+apt-get update
+echo "Installing checkbox packages..."
+apt-get install -y canonical-certification-server canonical-certification-submit plainbox
+echo "Finished checkbox installation"

=== added file 'hooks/iperf-service-relation-changed'
--- hooks/iperf-service-relation-changed	1970-01-01 00:00:00 +0000
+++ hooks/iperf-service-relation-changed	2014-09-16 20:11:39 +0000
@@ -0,0 +1,31 @@
+#!/bin/bash
+
+set -ex # If any command fails, stop execution of the hook with that error
+
+CONFIG_FILE="/etc/xdg/canonical-certification.conf"
+HOST=$(relation-get private-address)
+
+SECURE_ID=`config-get secure_id`
+WHITELIST=`config-get whitelist`
+RESULT_PATH=`config-get output_path`
+
+echo "Configure checkbox"
+
+sed -i '$ d' $CONFIG_FILE
+
+echo "TEST_TARGET_IPERF =  $HOST" >> $CONFIG_FILE
+
+if [ "$WHITELIST" != "" ]; then
+  if [ "$SECURE_ID" != "" ]; then
+    echo "Certification test is running.  The results will be submitted after the test is completed.  Check ${RESULT_PATH}/certification.log for status."
+    echo "Whitelist: ${WHITELIST}"
+    echo "Secure ID: ${SECURE_ID}"
+    plainbox run -w ${WHITELIST} -f xml -o ${RESULT_PATH}/submission.xml -t certification --transport-options=secure_id=${SECURE_ID} --transport-where=https://certification.canonical.com/submissions/submit/ 2>&1 | tee ${RESULT_PATH}/certification.log
+    echo "Certification test completed"
+  else
+    echo "Certification test is running.  Check ${RESULT_PATH}/certification.log for status."
+    echo "Whitelist: ${WHITELIST}"
+    plainbox run -w ${WHITELIST} -f xml -o ${RESULT_PATH}/submission.xml | tee ${RESULT_PATH}/certification.log
+    echo "Certification test completed"
+  fi
+fi

=== added file 'hooks/start'
--- hooks/start	1970-01-01 00:00:00 +0000
+++ hooks/start	2014-09-16 20:11:39 +0000
@@ -0,0 +1,4 @@
+#!/bin/bash
+# Here put anything that is needed to start the service.
+# Note that currently this is run directly after install
+# i.e. 'service apache2 start'

=== added file 'hooks/stop'
--- hooks/stop	1970-01-01 00:00:00 +0000
+++ hooks/stop	2014-09-16 20:11:39 +0000
@@ -0,0 +1,7 @@
+#!/bin/bash
+# This will be run when the service is being torn down, allowing you to disable
+# it in various ways..
+# For example, if your web app uses a text file to signal to the load balancer
+# that it is live... you could remove it and sleep for a bit to allow the load
+# balancer to stop sending traffic.
+# rm /srv/webroot/server-live.txt && sleep 30

=== added file 'metadata.yaml'
--- metadata.yaml	1970-01-01 00:00:00 +0000
+++ metadata.yaml	2014-09-16 20:11:39 +0000
@@ -0,0 +1,11 @@
+name: checkbox
+summary: Hardware testing tool 
+maintainer: Ashley Lai <[e-mail]>
+description: |
+  Checkbox is a hardware testing tool useful for certifying servers,
+  desktops and laptops. 
+categories:
+  - miscellaneous 
+requires:
+  iperf-service:
+    interface: iperf

=== added file 'revision'
--- revision	1970-01-01 00:00:00 +0000
+++ revision	2014-09-16 20:11:39 +0000
@@ -0,0 +1,1 @@
+3