Jenkaas Jobs

Merge ~saviq/jenkaas-jobs:fix-similar-releases into jenkaas-jobs:master

  1. Git
  2. lp:~saviq/jenkaas-jobs
  3. fix-similar-releases
  4. Merge into master
Proposed by Michał Sawicz
Status: Merged
Merged at revision: 4ffba977ce7b4840001eb529a88a7b1b1193691e
Proposed branch: ~saviq/jenkaas-jobs:fix-similar-releases
Merge into: jenkaas-jobs:master
Diff against target: 68 lines (+10/-10)
4 files modified
jenkaas_jobs/yaml/build/build-2-binpkg-0.py (+2/-2)
jenkaas_jobs/yaml/test/test-0-autopkgtest-0.py (+3/-3)
tests/fixtures/build/build-2-binpkg.xml (+2/-2)
tests/fixtures/test/test-0-autopkgtest.xml (+3/-3)
Reviewer Review Type Date Requested Status
Jenkaas Hackers Pending
Review via email: mp+292278@code.launchpad.net

Commit message

Fix binpkg and autopkgtest for similar releases

Fixes bug #1572149 - "release" matched both "release" and
"release+overlay".

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/jenkaas_jobs/yaml/build/build-2-binpkg-0.py b/jenkaas_jobs/yaml/build/build-2-binpkg-0.py
2index 1eb3dbf..fbc1476 100644
3--- a/jenkaas_jobs/yaml/build/build-2-binpkg-0.py
4+++ b/jenkaas_jobs/yaml/build/build-2-binpkg-0.py
5@@ -11,8 +11,8 @@ sourcepkg_url = "{{}}/job/{{}}/{{}}/api/xml".format(
6 os.environ["sourcepkg_run.jobName"],
7 os.environ["sourcepkg_run.number"]
8 )
9-xpath = "/matrixBuild/run/url[contains(text(),'{{}}')]/../number".format(
10- os.environ["release"])
11+xpath = ("/matrixBuild/run/url[contains(text(),'release={{}}/')]/../number"
12+ .format(os.environ["release"]))
13
14 sourcepkg_number = ElementTree.fromstring(
15 requests.get(sourcepkg_url, params={{"xpath": xpath}}).text).text
16diff --git a/jenkaas_jobs/yaml/test/test-0-autopkgtest-0.py b/jenkaas_jobs/yaml/test/test-0-autopkgtest-0.py
17index 7f0caec..3abffab 100644
18--- a/jenkaas_jobs/yaml/test/test-0-autopkgtest-0.py
19+++ b/jenkaas_jobs/yaml/test/test-0-autopkgtest-0.py
20@@ -21,11 +21,11 @@ build_url = "{{}}/job/{{}}/{{}}/api/xml".format(
21 print("Build job URL: {{}}".format(build_url))
22 src_xpath = (
23 "freeStyleBuild/action/triggeredBuild/run/url[contains(text(),"
24- "'build-1-sourcepkg/release={{}}')]".format(os.environ["release"]))
25+ "'build-1-sourcepkg/release={{}}/')]".format(os.environ["release"]))
26 bin_xpath = (
27 "freeStyleBuild/action/triggeredBuild/run/url[contains(text(),"
28- "'build-2-binpkg/arch={{}},release={{}}')]".format(arch,
29- os.environ["release"]))
30+ "'build-2-binpkg/arch={{}},release={{}}/')]".format(arch,
31+ os.environ["release"]))
32
33 for name, xpath in ("source", src_xpath), ("binary", bin_xpath):
34 print("XPath for {{}}: {{}}".format(name, xpath))
35diff --git a/tests/fixtures/build/build-2-binpkg.xml b/tests/fixtures/build/build-2-binpkg.xml
36index 184734a..39ad73b 100644
37--- a/tests/fixtures/build/build-2-binpkg.xml
38+++ b/tests/fixtures/build/build-2-binpkg.xml
39@@ -70,8 +70,8 @@ sourcepkg_url = "{}/job/{}/{}/api/xml".format(
40 os.environ["sourcepkg_run.jobName"],
41 os.environ["sourcepkg_run.number"]
42 )
43-xpath = "/matrixBuild/run/url[contains(text(),'{}')]/../number".format(
44- os.environ["release"])
45+xpath = ("/matrixBuild/run/url[contains(text(),'release={}/')]/../number"
46+ .format(os.environ["release"]))
47
48 sourcepkg_number = ElementTree.fromstring(
49 requests.get(sourcepkg_url, params={"xpath": xpath}).text).text
50diff --git a/tests/fixtures/test/test-0-autopkgtest.xml b/tests/fixtures/test/test-0-autopkgtest.xml
51index fd713c1..6038892 100644
52--- a/tests/fixtures/test/test-0-autopkgtest.xml
53+++ b/tests/fixtures/test/test-0-autopkgtest.xml
54@@ -95,11 +95,11 @@ build_url = "{}/job/{}/{}/api/xml".format(
55 print("Build job URL: {}".format(build_url))
56 src_xpath = (
57 "freeStyleBuild/action/triggeredBuild/run/url[contains(text(),"
58- "'build-1-sourcepkg/release={}')]".format(os.environ["release"]))
59+ "'build-1-sourcepkg/release={}/')]".format(os.environ["release"]))
60 bin_xpath = (
61 "freeStyleBuild/action/triggeredBuild/run/url[contains(text(),"
62- "'build-2-binpkg/arch={},release={}')]".format(arch,
63- os.environ["release"]))
64+ "'build-2-binpkg/arch={},release={}/')]".format(arch,
65+ os.environ["release"]))
66
67 for name, xpath in ("source", src_xpath), ("binary", bin_xpath):
68 print("XPath for {}: {}".format(name, xpath))

Subscribers

People subscribed via source and target branches