From 0aadc42532a5f347f497f2cfbf57cfe6e7b0e52d Mon Sep 17 00:00:00 2001 From: hyokeun Date: Mon, 27 Mar 2017 15:06:48 +0900 Subject: [PATCH] Update debian packaging files Change-Id: I9ac6a82aafdececde6ca162d2c9240e5860285d8 --- debian/control | 1 + debian/jenkins-scripts-common.install | 11 +++++++++++ debian/jenkins-scripts.install | 1 - debian/rules | 2 +- job_create_snapshot.py | 2 +- job_pre_release_obs.py | 2 +- 6 files changed, 15 insertions(+), 4 deletions(-) diff --git a/debian/control b/debian/control index ca5d587..98c7bc8 100644 --- a/debian/control +++ b/debian/control @@ -40,6 +40,7 @@ Depends: ${python:Depends}, python-snapdiff, python-yaml, python-lxml, + gbs-api, Description: image creator for Linux distributions The tool createrep is used to ppfarm test diff --git a/debian/jenkins-scripts-common.install b/debian/jenkins-scripts-common.install index f057b0a..0530971 100644 --- a/debian/jenkins-scripts-common.install +++ b/debian/jenkins-scripts-common.install @@ -15,3 +15,14 @@ debian/tmp/job_check_scm_meta_git.py /var/lib/jenkins/jenkins-scripts/ debian/tmp/templates/index.html /var/lib/jenkins/jenkins-scripts/templates/ debian/tmp/scripts/check_section.sh /var/lib/jenkins/jenkins-scripts/scripts/ debian/tmp/scripts/get_git_desc_info.sh /var/lib/jenkins/jenkins-scripts/scripts/ +debian/tmp/job_buildmonitor.py /var/lib/jenkins/jenkins-scripts/ +debian/tmp/job_ref_snapshot_info_update.py /var/lib/jenkins/jenkins-scripts/ +debian/tmp/job_make_dep_graph.py /var/lib/jenkins/jenkins-scripts/ +debian/tmp/common/dep_graph.php.template /var/lib/jenkins/jenkins-scripts/common/ +debian/tmp/common/dep_graph.php.template_simple /var/lib/jenkins/jenkins-scripts/common/ +debian/tmp/common/dep_parse.py /var/lib/jenkins/jenkins-scripts/common/ +debian/tmp/dep_graph/* /var/lib/jenkins/jenkins-scripts/dep_graph/ +debian/tmp/vis/* /var/lib/jenkins/jenkins-scripts/vis/ +debian/tmp/vis/dist/* /var/lib/jenkins/jenkins-scripts/vis/dist/ +debian/tmp/vis/dist/img/network/* /var/lib/jenkins/jenkins-scripts/vis/dist/img/network/ +debian/tmp/vis/dist/img/timeline/* /var/lib/jenkins/jenkins-scripts/vis/dist/img/timeline/ diff --git a/debian/jenkins-scripts.install b/debian/jenkins-scripts.install index 87d06f2..217a055 100644 --- a/debian/jenkins-scripts.install +++ b/debian/jenkins-scripts.install @@ -6,6 +6,5 @@ debian/tmp/job_request.py /var/lib/jenkins/jenkins-scripts/ debian/tmp/job_test_build.py /var/lib/jenkins/jenkins-scripts/ debian/tmp/job_rpm_buildlogs.py /var/lib/jenkins/jenkins-scripts/ debian/tmp/obs_requests /var/lib/jenkins/jenkins-scripts/ -debian/tmp/common/tempbuildpkg.py /var/lib/jenkins/jenkins-scripts/common/ debian/tmp/dir-purge-tool.sh /var/lib/jenkins/jenkins-scripts/scripts/ debian/tmp/logs-collector.sh /var/lib/jenkins/jenkins-scripts/scripts/ diff --git a/debian/rules b/debian/rules index 361b08a..4f02fae 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 job_*.py dir-purge-tool.sh logs-collector.sh common obs_requests templates scripts $(CURDIR)/debian/tmp/ + cp -r job_*.py dir-purge-tool.sh logs-collector.sh common obs_requests templates scripts dep_graph vis $(CURDIR)/debian/tmp/ binary-indep: build install dh_testdir dh_testroot diff --git a/job_create_snapshot.py b/job_create_snapshot.py index 33df42d..6c00966 100755 --- a/job_create_snapshot.py +++ b/job_create_snapshot.py @@ -26,9 +26,9 @@ import sys import re import datetime +from common.repomaker import RepoMaker, RepoMakerError from common.buildtrigger import trigger_info, trigger_next from common.buildservice import BuildService -from common.repomaker import RepoMaker, RepoMakerError from common.backenddb import BackendDB from common.snapshot import Snapshot, SnapshotError, snapshot_project_enabled from common.utils import make_latest_link diff --git a/job_pre_release_obs.py b/job_pre_release_obs.py index 042071b..75e043c 100755 --- a/job_pre_release_obs.py +++ b/job_pre_release_obs.py @@ -28,9 +28,9 @@ import shutil import base64 import datetime +from common.repomaker import find_files, RepoMaker, RepoMakerError from common.buildtrigger import trigger_info, trigger_next from common.buildservice import BuildService -from common.repomaker import find_files, RepoMaker, RepoMakerError from common.backenddb import BackendDB from common.prerelease import get_info_from_prerelease_name from common.snapshot import Snapshot, SnapshotError -- 2.7.4