From c12ac06e6e1856558db8a9791db5fa37eaa0ab3d Mon Sep 17 00:00:00 2001
From: MJB <mjb@it-innovation.soton.ac.uk>
Date: Thu, 31 May 2018 02:16:01 +0100
Subject: [PATCH] added new ci tests
---
.../services/loadtest-streaming/install.sh | 30 -----
.../telegraf_loadtest_streaming.conf | 112 ------------------
src/test/clmctest/services/minio/install.sh | 2 +-
src/test/clmctest/services/nginx/install.sh | 2 +-
src/test/clmctest/services/vlc/install.sh | 29 -----
5 files changed, 2 insertions(+), 173 deletions(-)
delete mode 100644 src/test/clmctest/services/loadtest-streaming/install.sh
delete mode 100644 src/test/clmctest/services/loadtest-streaming/telegraf_loadtest_streaming.conf
delete mode 100644 src/test/clmctest/services/vlc/install.sh
diff --git a/src/test/clmctest/services/loadtest-streaming/install.sh b/src/test/clmctest/services/loadtest-streaming/install.sh
deleted file mode 100644
index 7d6ef6d..0000000
--- a/src/test/clmctest/services/loadtest-streaming/install.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/bash
-#/////////////////////////////////////////////////////////////////////////
-#//
-#// (c) University of Southampton IT Innovation Centre, 2017
-#//
-#// Copyright in this software belongs to University of Southampton
-#// IT Innovation Centre of Gamma House, Enterprise Road,
-#// Chilworth Science Park, Southampton, SO16 7NS, UK.
-#//
-#// This software may not be used, sold, licensed, transferred, copied
-#// or reproduced in whole or in part in any manner or form or in or
-#// on any media by any person other than in accordance with the terms
-#// of the Licence Agreement supplied with the software, or otherwise
-#// without the prior written consent of the copyright owners.
-#//
-#// This software is distributed WITHOUT ANY WARRANTY, without even the
-#// implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#// PURPOSE, except where stated in the Licence Agreement supplied with
-#// the software.
-#//
-#// Created By : Michael Boniface
-#// Created Date : 14/02/2018
-#// Created for Project : FLAME
-#//
-#/////////////////////////////////////////////////////////////////////////
-set -euo pipefail
-
-echo "REPO_ROOT:"$REPO_ROOT
-eval '$REPO_ROOT/test/services/vlc/install.sh'
-eval '$REPO_ROOT/test/services/pytest/install.sh'
\ No newline at end of file
diff --git a/src/test/clmctest/services/loadtest-streaming/telegraf_loadtest_streaming.conf b/src/test/clmctest/services/loadtest-streaming/telegraf_loadtest_streaming.conf
deleted file mode 100644
index 3e30465..0000000
--- a/src/test/clmctest/services/loadtest-streaming/telegraf_loadtest_streaming.conf
+++ /dev/null
@@ -1,112 +0,0 @@
-# Telegraf configuration
-
-# Telegraf is entirely plugin driven. All metrics are gathered from the
-# declared inputs, and sent to the declared outputs.
-
-# Plugins must be declared in here to be active.
-# To deactivate a plugin, comment out the name and any variables.
-
-# Use 'telegraf -config telegraf.conf -test' to see what metrics a config
-# file would generate.
-
-# Global tags can be specified here in key="value" format.
-[global_tags]
- # location of the data centre
- location="{{LOCATION}}"
- # media service template id
- sfc="{{SFC_ID}}"
- # media service instance
- sfc_i="{{SFC_ID_INSTANCE}}"
- # service function type
- sf="{{SF_ID}}"
- # service function instance id
- sf_i="{{SF_ID_INSTANCE}}"
- # ipendpoint id aka surrogate instance
- ipendpoint="{{IP_ENDPOINT_ID}}"
-
-# Configuration for telegraf agent
-[agent]
- ## Default data collection interval for all inputs
- interval = "10s"
- ## Rounds collection interval to 'interval'
- ## ie, if interval="10s" then always collect on :00, :10, :20, etc.
- round_interval = true
-
- ## Telegraf will cache metric_buffer_limit metrics for each output, and will
- ## flush this buffer on a successful write.
- metric_buffer_limit = 1000
- ## Flush the buffer whenever full, regardless of flush_interval.
- flush_buffer_when_full = true
-
- ## Collection jitter is used to jitter the collection by a random amount.
- ## Each plugin will sleep for a random time within jitter before collecting.
- ## This can be used to avoid many plugins querying things like sysfs at the
- ## same time, which can have a measurable effect on the system.
- collection_jitter = "0s"
-
- ## Default flushing interval for all outputs. You shouldn't set this below
- ## interval. Maximum flush_interval will be flush_interval + flush_jitter
- flush_interval = "10s"
- ## Jitter the flush interval by a random amount. This is primarily to avoid
- ## large write spikes for users running a large number of telegraf instances.
- ## ie, a jitter of 5s and interval 10s means flushes will happen every 10-15s
- flush_jitter = "0s"
-
- ## Logging configuration:
- ## Run telegraf in debug mode
- debug = false
- ## Run telegraf in quiet mode
- quiet = false
- ## Specify the log file name. The empty string means to log to stdout.
- logfile = "/var/log/telegraf/telegraf.log"
-
- ## Override default hostname, if empty use os.Hostname()
- hostname = ""
-
-
-###############################################################################
-# OUTPUTS #
-###############################################################################
-
-# Configuration for influxdb server to send metrics to
-[[outputs.influxdb]]
- # The full HTTP or UDP endpoint URL for your InfluxDB instance.
- # Multiple urls can be specified but it is assumed that they are part of the same
- # cluster, this means that only ONE of the urls will be written to each interval.
- # urls = ["udp://127.0.0.1:8089"] # UDP endpoint example
- urls = ["{{INFLUXDB_URL}}"] # required
- # The target database for metrics (telegraf will create it if not exists)
- database = "{{DATABASE_NAME}}" # required
- # Precision of writes, valid values are "ns", "us" (or "µs"), "ms", "s", "m", "h".
- # note: using second precision greatly helps InfluxDB compression
- precision = "s"
-
- ## Write timeout (for the InfluxDB client), formatted as a string.
- ## If not provided, will default to 5s. 0s means no timeout (not recommended).
- timeout = "5s"
- # username = "telegraf"
- # password = "metricsmetricsmetricsmetrics"
- # Set the user agent for HTTP POSTs (can be useful for log differentiation)
- # user_agent = "telegraf"
- # Set UDP payload size, defaults to InfluxDB UDP Client default (512 bytes)
- # udp_payload = 512
-
-
-###############################################################################
-# INPUTS #
-###############################################################################
-# # Influx HTTP write listener
-[[inputs.http_listener]]
- ## Address and port to host HTTP listener on
- service_address = ":8186"
-
- ## timeouts
- read_timeout = "10s"
- write_timeout = "10s"
-
- ## HTTPS
- #tls_cert= "/etc/telegraf/cert.pem"
- #tls_key = "/etc/telegraf/key.pem"
-
- ## MTLS
- #tls_allowed_cacerts = ["/etc/telegraf/clientca.pem"]
\ No newline at end of file
diff --git a/src/test/clmctest/services/minio/install.sh b/src/test/clmctest/services/minio/install.sh
index 5c7ff69..fd5ad41 100644
--- a/src/test/clmctest/services/minio/install.sh
+++ b/src/test/clmctest/services/minio/install.sh
@@ -56,7 +56,7 @@ cd minio
go install -v -ldflags "$(go run buildscripts/gen-ldflags.go)"
# check minio configuration available
-MINIO_CONF_SOURCE=$REPO_ROOT"/clmctest/services/minio/minio.conf"
+MINIO_CONF_SOURCE=$REPO_ROOT"/src/test/clmctest/services/minio/minio.conf"
if [ ! -f "$MINIO_CONF_SOURCE" ]; then
echo "Error: MINIO conf file does not exist on in the repo. "$MINIO_CONF_SOURCE
exit 1
diff --git a/src/test/clmctest/services/nginx/install.sh b/src/test/clmctest/services/nginx/install.sh
index 7080fe8..cb62205 100644
--- a/src/test/clmctest/services/nginx/install.sh
+++ b/src/test/clmctest/services/nginx/install.sh
@@ -31,7 +31,7 @@ yes Y | apt-get install nginx
# Need to set up basic stats as this not configured by default
# http://nginx.org/en/docs/http/ngx_http_stub_status_module.html
-NGINX_CONF_SOURCE=$REPO_ROOT"/clmctest/services/nginx/nginx.conf"
+NGINX_CONF_SOURCE=$REPO_ROOT"/src/test/clmctest/services/nginx/nginx.conf"
NGINX_CONF_TARGET="/etc/nginx/nginx.conf"
# Check the target telegraf directory exists
diff --git a/src/test/clmctest/services/vlc/install.sh b/src/test/clmctest/services/vlc/install.sh
deleted file mode 100644
index 02e3b8f..0000000
--- a/src/test/clmctest/services/vlc/install.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-#/////////////////////////////////////////////////////////////////////////
-#//
-#// (c) University of Southampton IT Innovation Centre, 2017
-#//
-#// Copyright in this software belongs to University of Southampton
-#// IT Innovation Centre of Gamma House, Enterprise Road,
-#// Chilworth Science Park, Southampton, SO16 7NS, UK.
-#//
-#// This software may not be used, sold, licensed, transferred, copied
-#// or reproduced in whole or in part in any manner or form or in or
-#// on any media by any person other than in accordance with the terms
-#// of the Licence Agreement supplied with the software, or otherwise
-#// without the prior written consent of the copyright owners.
-#//
-#// This software is distributed WITHOUT ANY WARRANTY, without even the
-#// implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#// PURPOSE, except where stated in the Licence Agreement supplied with
-#// the software.
-#//
-#// Created By : Michael Boniface
-#// Created Date : 12/02/2018
-#// Created for Project : FLAME
-#//
-#/////////////////////////////////////////////////////////////////////////
-
-add-apt-repository -y ppa:videolan/master-daily
-apt-get update
-apt-get -y install vlc
\ No newline at end of file
--
GitLab