Fix bug that lack of git-buildpackage-common package.

Change-Id: I4f8b39b6fd0492db20dc17f59f69f94b28043b03

diff --git a/packaging/jenkins-scripts.spec b/packaging/jenkins-scripts.spec
old mode 100644 (file)
new mode 100755 (executable)
index a92585e..c8be41a
--- a/packaging/jenkins-scripts.spec
+++ b/packaging/jenkins-scripts.spec
@@ -110,6 +110,7 @@ Isolated job_submitobs to avoid package installation conflicts
 %package pmb
 Summary:    pmb scripts for Tools&Services development and test process
 Group:      Development/Tools/Building
+Requires:   %{name}-common = %{version}-%{release}
 
 %description pmb
 pmb scripts for Tools&Services development and test process

diff --git a/pmb/job_release_mail_sender.py b/pmb/job_release_mail_sender.py
old mode 100644 (file)
new mode 100755 (executable)
index a034260..d1a2867
--- a/pmb/job_release_mail_sender.py
+++ b/pmb/job_release_mail_sender.py
@@ -24,7 +24,7 @@ import re
 import requests
 from bs4 import BeautifulSoup
 
-sys.path.insert(0, os.path.join(os.getcwd(), 'jenkins-scripts'))
+sys.path.insert(1, os.path.join(sys.path[0], '..'))
 from common.send_mail import prepare_mail
 
 

diff --git a/pmb/job_tool_history_update.py b/pmb/job_tool_history_update.py
index cdacdd5..15129e1 100755 (executable)
--- a/pmb/job_tool_history_update.py
+++ b/pmb/job_tool_history_update.py
@@ -15,7 +15,7 @@ import MySQLdb.cursors
 import requests
 import re
 
-sys.path.insert(0, os.path.join(os.getcwd(), 'jenkins-scripts'))
+sys.path.insert(1, os.path.join(sys.path[0], '..'))
 
 from bs4 import BeautifulSoup
 from common.buildmonitor_db import do_query, get_value_from_query_data, do_many_query

diff --git a/pmb/job_tool_jira_receiver.py b/pmb/job_tool_jira_receiver.py
old mode 100644 (file)
new mode 100755 (executable)
index dac5692..a14e9e3
--- a/pmb/job_tool_jira_receiver.py
+++ b/pmb/job_tool_jira_receiver.py
@@ -14,7 +14,7 @@ import base64
 import MySQLdb
 import MySQLdb.cursors
 
-sys.path.insert(0, os.path.join(os.getcwd(), 'jenkins-scripts'))
+sys.path.insert(1, os.path.join(sys.path[0], '..'))
 
 from common.buildmonitor_db import do_query, get_value_from_query_data, do_many_query
 from common.buildmonitor_extention import BuildMonitorExtention

diff --git a/pmb/trigger_tools_staging_test.py b/pmb/trigger_tools_staging_test.py
index be60a0d..efe6465 100755 (executable)
--- a/pmb/trigger_tools_staging_test.py
+++ b/pmb/trigger_tools_staging_test.py
@@ -1,7 +1,7 @@
 import sys
 import os
 
-sys.path.insert(0, os.path.join(os.getcwd(), 'jenkins-scripts'))
+sys.path.insert(1, os.path.join(sys.path[0], '..'))
 
 from common.git import Git, clone_gitproject, GitError
 from common.gerrit import Gerrit, GerritError