← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] ~pelpsi/launchpad:fix-lpbuildbot-propagate-launchpad-context into launchpad:master

 

Simone Pelosi has proposed merging ~pelpsi/launchpad:fix-lpbuildbot-propagate-launchpad-context into launchpad:master.

Commit message:
Add new variables to extra build args


Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~pelpsi/launchpad/+git/launchpad/+merge/475697
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~pelpsi/launchpad:fix-lpbuildbot-propagate-launchpad-context into launchpad:master.
diff --git a/lib/lp/code/model/tests/test_recipebuilder.py b/lib/lp/code/model/tests/test_recipebuilder.py
index 7955ae3..85ba544 100644
--- a/lib/lp/code/model/tests/test_recipebuilder.py
+++ b/lib/lp/code/model/tests/test_recipebuilder.py
@@ -212,6 +212,8 @@ class TestAsyncRecipeBuilder(TestRecipeBuilderBase):
                 "build_url": canonical_url(job.build),
                 "builder_constraints": [],
                 "fast_cleanup": True,
+                "launchpad_instance": "devel",
+                "launchpad_server_url": "launchpad.test",
                 "ogrecomponent": "universe",
                 "recipe_text": "# bzr-builder format 0.3 "
                 "deb-version {debupstream}-0~{revno}\n"
@@ -314,6 +316,8 @@ class TestAsyncRecipeBuilder(TestRecipeBuilderBase):
                 "build_url": canonical_url(job.build),
                 "builder_constraints": [],
                 "fast_cleanup": True,
+                "launchpad_instance": "devel",
+                "launchpad_server_url": "launchpad.test",
                 "ogrecomponent": "universe",
                 "recipe_text": "# bzr-builder format 0.3 "
                 "deb-version {debupstream}-0~{revno}\n"
@@ -364,6 +368,8 @@ class TestAsyncRecipeBuilder(TestRecipeBuilderBase):
                 "builder_constraints": [],
                 "fast_cleanup": True,
                 "git": True,
+                "launchpad_instance": "devel",
+                "launchpad_server_url": "launchpad.test",
                 "ogrecomponent": "universe",
                 "recipe_text": "# git-build-recipe format 0.4 deb-version "
                 "{debupstream}-0~{revtime}\n"
diff --git a/lib/lp/soyuz/tests/test_binarypackagebuildbehaviour.py b/lib/lp/soyuz/tests/test_binarypackagebuildbehaviour.py
index c7eaf0d..625bf5b 100644
--- a/lib/lp/soyuz/tests/test_binarypackagebuildbehaviour.py
+++ b/lib/lp/soyuz/tests/test_binarypackagebuildbehaviour.py
@@ -172,6 +172,8 @@ class TestBinaryBuildPackageBehaviour(StatsMixin, TestCaseWithFactory):
             "builder_constraints": [],
             "fast_cleanup": builder.virtualized,
             "image_type": "chroot",
+            "launchpad_instance": "devel",
+            "launchpad_server_url": "launchpad.test",
             "ogrecomponent": component,
             "series": ds_name,
             "suite": suite,
diff --git a/lib/lp/soyuz/tests/test_livefsbuildbehaviour.py b/lib/lp/soyuz/tests/test_livefsbuildbehaviour.py
index 142e97c..fd1e96b 100644
--- a/lib/lp/soyuz/tests/test_livefsbuildbehaviour.py
+++ b/lib/lp/soyuz/tests/test_livefsbuildbehaviour.py
@@ -208,6 +208,8 @@ class TestAsyncLiveFSBuildBehaviour(TestLiveFSBuildBehaviourBase):
                 "builder_constraints": [],
                 "datestamp": "20140425-103800",
                 "fast_cleanup": True,
+                "launchpad_instance": "devel",
+                "launchpad_server_url": "launchpad.test",
                 "pocket": "release",
                 "project": "distro",
                 "subproject": "special",
diff --git a/lib/lp/translations/tests/test_translationtemplatesbuildbehaviour.py b/lib/lp/translations/tests/test_translationtemplatesbuildbehaviour.py
index a8d26d3..f19d0e9 100644
--- a/lib/lp/translations/tests/test_translationtemplatesbuildbehaviour.py
+++ b/lib/lp/translations/tests/test_translationtemplatesbuildbehaviour.py
@@ -114,6 +114,8 @@ class TestTranslationTemplatesBuildBehaviour(
                     "build_url": canonical_url(behaviour.build),
                     "builder_constraints": [],
                     "fast_cleanup": True,
+                    "launchpad_instance": "devel",
+                    "launchpad_server_url": "launchpad.test",
                     "series": das.distroseries.name,
                 },
             ),