Merge pull request #50 from lttng/kill-dangling-processes

Kill dangling test processes before running tests

diff --git a/.gitignore b/.gitignore
index aafadd3b53b2e940d2a24d2bf9be56f3bd940234..a4670d6e4731c7f2864f08f26ee60e59c69d898a 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,5 @@
 /.tox
 .venv*/
 *.retry
+lava/pdudaemon/venv/
+lava/pdudaemon/pdudaemon.db

diff --git a/lava/devices/kvm01.jinja2 b/lava/devices/kvm01.jinja2
new file mode 100644 (file)
index 0000000..1eac22e
--- /dev/null
+++ b/lava/devices/kvm01.jinja2
@@ -0,0 +1,8 @@
+{% extends 'qemu.jinja2' %}
+{% set mac_addr = 'DE:AD:BE:EF:00:00' %}
+{% set memory = '2096' %}
+{% set netdevice = 'tap' %}
+{% set extra_options = (
+"
+          - -smp 2"
+) %}

diff --git a/lava/devices/kvm02.jinja2 b/lava/devices/kvm02.jinja2
new file mode 100644 (file)
index 0000000..0ae3c21
--- /dev/null
+++ b/lava/devices/kvm02.jinja2
@@ -0,0 +1,9 @@
+{% extends 'qemu.jinja2' %}
+{% set mac_addr = 'DE:AD:BE:FF:00:01' %}
+{% set memory = '2096' %}
+{% set netdevice = 'tap' %}
+{% set extra_options = (
+"
+          - -smp 2"
+) %}
+

diff --git a/lava/devices/x86_server01-cloud08.jinja2 b/lava/devices/x86_server01-cloud08.jinja2
new file mode 100644 (file)
index 0000000..2057a09
--- /dev/null
+++ b/lava/devices/x86_server01-cloud08.jinja2
@@ -0,0 +1,8 @@
+{% extends 'x86.jinja2' %}
+{% set connection_command = 'telnet serial01.internal.efficios.com 7025' %}
+{% set hard_reset_command = '/usr/bin/pduclient --daemon localhost --hostname pdu01.internal.efficios.com --command reboot --port 05' %}
+{% set power_off_command = '/usr/bin/pduclient --daemon localhost --hostname pdu01.internal.efficios.com --command off --port 05' %}
+{% set power_on_command = '/usr/bin/pduclient --daemon localhost --hostname pdu01.internal.efficios.com --command on --port 05'' %}
+{% set soft_reset_command = 'reboot'}
+{% set boot_interface = 'net2'}
+{% set kernel_extra_args = 'cpuidle.off=1'}

diff --git a/lava/pdudaemon/daemon.sh b/lava/pdudaemon/daemon.sh
new file mode 100644 (file)
index 0000000..2a83c2e
--- /dev/null
+++ b/lava/pdudaemon/daemon.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+WORK_DIR="$(dirname "$(readlink -f "$0")")"
+VENV="${WORK_DIR}/venv/bin/activate"
+
+source "${VENV}"
+
+pdudaemon --journal --dbfile="${WORK_DIR}/pdudaemon.db" --conf="${WORK_DIR}/pdudaemon.conf"

diff --git a/lava/pdudaemon/pdudaemon.conf b/lava/pdudaemon/pdudaemon.conf
new file mode 100644 (file)
index 0000000..aaea8df
--- /dev/null
+++ b/lava/pdudaemon/pdudaemon.conf
@@ -0,0 +1,18 @@
+{
+    "daemon": {
+        "hostname": "0.0.0.0",
+        "port": 16421,
+        "dbname": "pdudaemon",
+        "logging_level": "DEBUG"
+    },
+    "pdus": {
+        "pdu01.internal.efficios.com": {
+            "driver": "apc7932",
+            "username": "lava",
+            "password": "lava"
+        },
+        "carrier-armhf.internal.efficios.com": {
+            "driver": "consoleserver"
+        }
+    }
+}

diff --git a/lava/pdudaemon/pdudaemon.service b/lava/pdudaemon/pdudaemon.service
new file mode 100644 (file)
index 0000000..10ee7b1
--- /dev/null
+++ b/lava/pdudaemon/pdudaemon.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Control and Queueing daemon for PDUs
+
+[Service]
+ExecStart=/bin/bash /home/lava//lttng-ci/lava/pdudaemon/daemon.sh
+Type=simple
+User=lava
+Restart=on-abnormal
+
+[Install]
+WantedBy=multi-user.target