Merge pull request #502 from uilianries/bugfix/build-policy

Fix build policies

Author: uilianries

cpt/packager.py

@@ -240,16 +240,11 @@ def __init__(self, username=None, channel=None, runner=None,
                                               mingw_configurations, archs, allow_gcc_minors,
                                               build_types, options, cppstds)
 
-        build_policy = (build_policy or
+        self.build_policy = (build_policy or
                         self.ci_manager.get_commit_build_policy() or
-                        os.getenv("CONAN_BUILD_POLICY", None))
-
-        # ensure backward compatibility
-        # build_policy can be list or a string https://github.com/conan-io/conan-package-tools/issues/394
-        if build_policy and not isinstance(build_policy, list):
-            build_policy = [x.strip() for x in build_policy.split(',')]
-
-        self.build_policy = build_policy
+                        split_colon_env("CONAN_BUILD_POLICY"))
+        if isinstance(self.build_policy, list):
+            self.build_policy = ",".join(self.build_policy)
 
         self.sudo_docker_command = ""
         if "CONAN_DOCKER_USE_SUDO" in os.environ:

cpt/run_in_docker.py

@@ -26,8 +26,6 @@ def run():
     upload_only_recipe = os.getenv("CPT_UPLOAD_ONLY_RECIPE")
     uploader = Uploader(conan_api, remotes_manager, auth_manager, printer, upload_retry)
     build_policy = unscape_env(os.getenv("CPT_BUILD_POLICY"))
-    if build_policy:
-        build_policy = build_policy.split(",")
     test_folder = unscape_env(os.getenv("CPT_TEST_FOLDER"))
     reference = ConanFileReference.loads(os.getenv("CONAN_REFERENCE"))
 

cpt/runner.py

@@ -30,7 +30,10 @@ def __init__(self, profile_abs_path, reference, conan_api, uploader,
         self._profile_abs_path = profile_abs_path
         self._reference = reference
         self._exclude_vcvars_precommand = exclude_vcvars_precommand
-        self._build_policy = build_policy
+        self._build_policy =  build_policy.split(",") if \
+                              isinstance(build_policy, str) else \
+                              build_policy
+        self._build_policy = self._build_policy or []
         self._runner = PrintRunner(runner or os.system, self.printer)
         self._test_folder = test_folder
         self._config_url = config_url
@@ -187,7 +190,7 @@ def __init__(self, profile_text, base_profile_text, base_profile_name, reference
         self._upload_only_recipe = upload_only_recipe
         self._reference = reference
         self._conan_pip_package = conan_pip_package
-        self._build_policy = build_policy
+        self._build_policy = build_policy or []
         self._docker_image = docker_image
         self._always_update_conan_in_docker = always_update_conan_in_docker
         self._docker_image_skip_update = docker_image_skip_update
@@ -335,7 +338,7 @@ def get_env_vars(self):
         ret["CPT_UPLOAD_ENABLED"] = self._upload
         ret["CPT_UPLOAD_RETRY"] = self._upload_retry
         ret["CPT_UPLOAD_ONLY_RECIPE"] = self._upload_only_recipe
-        ret["CPT_BUILD_POLICY"] = escape_env(self._build_policy.join(",")) if self._build_policy else escape_env(self._build_policy)
+        ret["CPT_BUILD_POLICY"] = escape_env(self._build_policy)
         ret["CPT_TEST_FOLDER"] = escape_env(self._test_folder)
         ret["CPT_CONFIG_URL"] = escape_env(self._config_url)
         ret["CPT_CONFIG_ARGS"] = escape_env(self._config_args)

cpt/test/integration/basic_test.py

@@ -158,7 +158,7 @@ class Pkg(ConanFile):
         self.assertTrue(found_in_export_sources)
 
     def test_build_policy(self):
-        ci_manager = MockCIManager(build_policy="outdated")
+        ci_manager = MockCIManager()
         conanfile = """from conans import ConanFile
 import os
 
@@ -170,6 +170,18 @@ class Pkg(ConanFile):
 """
         self.save_conanfile(conanfile)
         with tools.environment_append({"CONAN_USERNAME": "lasote"}):
+            self.packager = ConanMultiPackager(channel="mychannel",
+                                               gcc_versions=["6"],
+                                               visual_versions=["12"],
+                                               archs=["x86", "x86_64"],
+                                               build_types=["Release"],
+                                               build_policy="outdated",
+                                               ci_manager=ci_manager)
+            self.packager.add_common_builds()
+            self.packager.run()
+
+        with tools.environment_append({"CONAN_USERNAME": "lasote",
+                                       "CONAN_BUILD_POLICY": "outdated"}):
             self.packager = ConanMultiPackager(channel="mychannel",
                                                gcc_versions=["6"],
                                                visual_versions=["12"],
@@ -180,7 +192,7 @@ class Pkg(ConanFile):
             self.packager.run()
 
     def test_multiple_build_policy(self):
-        ci_manager = MockCIManager(build_policy=["lib", "outdated"])
+        ci_manager = MockCIManager()
         conanfile = """from conans import ConanFile
 import os
 
@@ -192,6 +204,18 @@ class Pkg(ConanFile):
 """
         self.save_conanfile(conanfile)
         with tools.environment_append({"CONAN_USERNAME": "lasote"}):
+            self.packager = ConanMultiPackager(channel="mychannel",
+                                               gcc_versions=["6"],
+                                               visual_versions=["12"],
+                                               archs=["x86", "x86_64"],
+                                               build_types=["Release"],
+                                               build_policy=["cascade", "outdated"],
+                                               ci_manager=ci_manager)
+            self.packager.add_common_builds()
+            self.packager.run()
+
+        with tools.environment_append({"CONAN_USERNAME": "lasote",
+                                       "CONAN_BUILD_POLICY": "outdated, lib"}):
             self.packager = ConanMultiPackager(channel="mychannel",
                                                gcc_versions=["6"],
                                                visual_versions=["12"],