diff options
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | base-repos-tizenorg.conf | 29 | ||||
| -rw-r--r-- | coverage.xml-fake | 25 | ||||
| -rwxr-xr-x | debian/rules | 2 | ||||
| -rw-r--r-- | debian/tools-testing-settings-tizenorg.install | 4 | ||||
| -rw-r--r-- | debian/tools-testing.install | 2 | ||||
| -rw-r--r-- | nosetests.xml-fake | 6 | ||||
| -rw-r--r-- | packaging/tools-testing.spec | 12 | ||||
| -rw-r--r-- | servers-tizenorg.conf | 7 |
9 files changed, 12 insertions, 81 deletions
@@ -15,10 +15,10 @@ install: install -m 0644 sudoers.jenkins $(DESTDIR)/etc/sudoers.d/jenkins install -d $(DESTDIR)/etc/jenkins-worker install -m 0644 workers.env $(DESTDIR)/etc/jenkins-worker - install -d $(DESTDIR)/etc/tools-tester.d - install -m 0644 base-repos-*.conf servers-*.conf $(DESTDIR)/etc/tools-tester.d +# install -d $(DESTDIR)/etc/tools-tester.d +# install -m 0644 base-repos-*.conf servers-*.conf $(DESTDIR)/etc/tools-tester.d install -d $(DESTDIR)/var/lib/jenkins - install -m 0644 coverage.xml-fake nosetests.xml-fake $(DESTDIR)/var/lib/jenkins +# install -m 0644 coverage.xml-fake nosetests.xml-fake $(DESTDIR)/var/lib/jenkins test: - checkbashisms $(SH_FILES) diff --git a/base-repos-tizenorg.conf b/base-repos-tizenorg.conf deleted file mode 100644 index 2d69c70..0000000 --- a/base-repos-tizenorg.conf +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright (c) 2013, 2014, 2015 Intel, Inc. -# -# 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; version 2 of the License -# -# 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. -# -# Repositories configuration for Tools Tester -# Following section describes base and update repositories for supported distributions -# A tester host VM has initially no repositories configured. -# It picks a line from here using grep with DISTRO_VERSION pattern, -# and adds repositories, listed on that line, comma separated. -# Note: do not leave leading, trailing spaces, also dont use matching pattern in comments. -# -Debian_7:deb http://mirrors.vlan200.tizen.org/debian/ wheezy main,deb http://mirrors.vlan200.tizen.org/debian/ wheezy-updates main -CentOS_6:http://mirrors.vlan200.tizen.org/centos/$releasever/os/$basearch/,http://mirrors.vlan200.tizen.org/centos/$releasever/updates/$basearch/,http://mirrors.vlan200.tizen.org/fedora-epel/$releasever/$basearch/ -Fedora_20:http://mirrors.vlan200.tizen.org/fedora/releases/$releasever/Everything/$basearch/os/,http://mirrors.vlan200.tizen.org/fedora/updates/$releasever/$basearch/ -Fedora_21:http://mirrors.vlan200.tizen.org/fedora/releases/$releasever/Everything/$basearch/os/,http://mirrors.vlan200.tizen.org/fedora/updates/$releasever/$basearch/ -openSUSE_12.3:http://osrepo.vlan200.tizen.org:8000/distribution/12.3/repo/oss/,http://osrepo.vlan200.tizen.org:8000/update/12.3/ -openSUSE_13.1:http://osrepo.vlan200.tizen.org:8000/distribution/13.1/repo/oss/,http://osrepo.vlan200.tizen.org:8000/update/13.1/ -openSUSE_13.2:http://osrepo.vlan200.tizen.org:8000/distribution/13.2/repo/oss/,http://osrepo.vlan200.tizen.org:8000/update/13.2/ -Ubuntu_12.04:deb http://mirrors.vlan200.tizen.org/ubuntu/ precise main restricted,deb http://mirrors.vlan200.tizen.org/ubuntu/ precise-updates main restricted,deb http://mirrors.vlan200.tizen.org/ubuntu/ precise universe,deb http://mirrors.vlan200.tizen.org/ubuntu/ precise-updates universe -Ubuntu_14.04:deb http://mirrors.vlan200.tizen.org/ubuntu/ trusty main restricted,deb http://mirrors.vlan200.tizen.org/ubuntu/ trusty-updates main restricted,deb http://mirrors.vlan200.tizen.org/ubuntu/ trusty universe,deb http://mirrors.vlan200.tizen.org/ubuntu/ trusty-updates universe restricted -Ubuntu_14.10:deb http://mirrors.vlan200.tizen.org/ubuntu/ utopic main restricted,deb http://mirrors.vlan200.tizen.org/ubuntu/ utopic-updates main restricted,deb http://mirrors.vlan200.tizen.org/ubuntu/ utopic universe,deb http://mirrors.vlan200.tizen.org/ubuntu/ utopic-updates universe -Ubuntu_15.04:deb http://mirrors.vlan200.tizen.org/ubuntu/ vivid main restricted,deb http://mirrors.vlan200.tizen.org/ubuntu/ vivid-updates main restricted,deb http://mirrors.vlan200.tizen.org/ubuntu/ vivid universe,deb http://mirrors.vlan200.tizen.org/ubuntu/ vivid-updates universe diff --git a/coverage.xml-fake b/coverage.xml-fake deleted file mode 100644 index e6ccd57..0000000 --- a/coverage.xml-fake +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0" ?> -<!DOCTYPE coverage - SYSTEM 'http://cobertura.sourceforge.net/xml/coverage-03.dtd'> -<coverage branch-rate="0" line-rate="1" timestamp="1365143016134" version="3.5.1"> - <!-- Generated by coverage.py: http://nedbatchelder.com/code/coverage --> - <packages> - <package branch-rate="0" complexity="0" line-rate="1" name="obs_service_gbp"> - <classes> - <class branch-rate="0" complexity="0" filename="obs_service_gbp/__init__.py" line-rate="1" name="__init__"> - <methods/> - <lines> - <line hits="1" number="19"/> - </lines> - </class> - <class branch-rate="0" complexity="0" filename="obs_service_gbp/command.py" line-rate="1" name="command"> - <methods/> - <lines> - <line hits="1" number="19"/> - </lines> - </class> - </classes> - </package> - </packages> -</coverage> - diff --git a/debian/rules b/debian/rules index fa8afe0..4dc35f5 100755 --- a/debian/rules +++ b/debian/rules @@ -23,7 +23,7 @@ install: build # Installing package mkdir -p $(CURDIR)/debian/tmp/ install -d $(CURDIR)/debian/tmp/ - cp -r *.sh *.py *.conf *.env build-package install_package run_tests runtester safeosc sudoers.jenkins pre_deployment_test *.xml-fake $(CURDIR)/debian/tmp/ + cp -r *.sh *.py *.env build-package install_package run_tests runtester safeosc sudoers.jenkins pre_deployment_test $(CURDIR)/debian/tmp/ binary-indep: build install dh_testdir dh_testroot diff --git a/debian/tools-testing-settings-tizenorg.install b/debian/tools-testing-settings-tizenorg.install index df6cc91..e722d85 100644 --- a/debian/tools-testing-settings-tizenorg.install +++ b/debian/tools-testing-settings-tizenorg.install @@ -1,2 +1,2 @@ -debian/tmp/base-repos-tizenorg.conf /etc/tools-tester.d/ -debian/tmp/servers-tizenorg.conf /etc/tools-tester.d/ +#debian/tmp/base-repos-tizenorg.conf /etc/tools-tester.d/ +#debian/tmp/servers-tizenorg.conf /etc/tools-tester.d/ diff --git a/debian/tools-testing.install b/debian/tools-testing.install index 871e62a..c0b95ea 100644 --- a/debian/tools-testing.install +++ b/debian/tools-testing.install @@ -12,5 +12,3 @@ debian/tmp/safeosc /usr/bin/ debian/tmp/trigger_itest_verify.py /usr/bin/ debian/tmp/pre_deployment_test/ /usr/lib/python2.7/dist-packages/ debian/tmp/sudoers.jenkins /etc/sudoers.d/ -debian/tmp/coverage.xml-fake /var/lib/jenkins/ -debian/tmp/nosetests.xml-fake /var/lib/jenkins/ diff --git a/nosetests.xml-fake b/nosetests.xml-fake deleted file mode 100644 index 6482a64..0000000 --- a/nosetests.xml-fake +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<testsuite name="nosetests" tests="1"> -<testcase classname="tests.test_prod" name="test_succeeding" time="0.001"> -</testcase> -</testsuite> - diff --git a/packaging/tools-testing.spec b/packaging/tools-testing.spec index 9a0a142..61cf6ae 100644 --- a/packaging/tools-testing.spec +++ b/packaging/tools-testing.spec @@ -76,9 +76,9 @@ fi %{python_sitelib}/pre_deployment_test-*-py*.egg-info %dir /etc/sudoers.d %config /etc/sudoers.d/jenkins -%dir /var/lib/jenkins/ -/var/lib/jenkins/coverage.xml-fake -/var/lib/jenkins/nosetests.xml-fake +#%dir /var/lib/jenkins/ +#/var/lib/jenkins/coverage.xml-fake +#/var/lib/jenkins/nosetests.xml-fake ############################################### %files mgmt @@ -91,6 +91,6 @@ fi ############################################### %files settings-tizenorg %defattr(-,root,root,-) -%dir /etc/tools-tester.d -%config /etc/tools-tester.d/base-repos-tizenorg.conf -%config /etc/tools-tester.d/servers-tizenorg.conf +#%dir /etc/tools-tester.d +#%config /etc/tools-tester.d/base-repos-tizenorg.conf +#%config /etc/tools-tester.d/servers-tizenorg.conf diff --git a/servers-tizenorg.conf b/servers-tizenorg.conf deleted file mode 100644 index 174af21..0000000 --- a/servers-tizenorg.conf +++ /dev/null @@ -1,7 +0,0 @@ -# -# Servers configuration for Tools Tester -# Following section describes servers that are needed for Tools Tester -# Tester picks a line from here using grep, -# Note: do not leave leading, trailing spaces, also dont use matching pattern in comments. -# -DOWNLOAD_HOST:http://repos.vlan200.tizen.org |