diff options
Diffstat (limited to 'apex/build.py')
-rw-r--r-- | apex/build.py | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/apex/build.py b/apex/build.py index dff25ac8..6e903814 100644 --- a/apex/build.py +++ b/apex/build.py @@ -109,11 +109,15 @@ def unpack_cache(cache_dest, cache_dir=None): def build(build_root, version, iso=False, rpms=False): if iso: - make_targets = ['iso'] + logging.warning("iso is deprecated. Will not build iso and build rpm " + "instead.") + make_targets = ['rpm'] elif rpms: - make_targets = ['rpms'] + make_targets = ['rpm'] else: - make_targets = ['images', 'rpms-check'] + logging.warning("Nothing specified to build, and images are no " + "longer supported in Apex. Will only run rpm check") + make_targets = ['rpm-check'] if version is not None: make_args = ['RELEASE={}'.format(version)] else: @@ -234,9 +238,7 @@ def main(): logging.error("Must be in an Apex git repo to execute build") raise apex_build_root = os.path.join(apex_root, BUILD_ROOT) - if os.path.isdir(apex_build_root): - cache_tmp_dir = os.path.join(apex_root, TMP_CACHE) - else: + if not os.path.isdir(apex_build_root): logging.error("You must execute this script inside of the Apex " "local code repository") raise ApexBuildException("Invalid path for apex root: {}. Must be " @@ -245,10 +247,7 @@ def main(): dep_playbook = os.path.join(apex_root, 'lib/ansible/playbooks/build_dependencies.yml') utils.run_ansible(None, dep_playbook) - unpack_cache(cache_tmp_dir, args.cache_dir) build(apex_build_root, args.build_version, args.iso, args.rpms) - build_cache(cache_tmp_dir, args.cache_dir) - prune_cache(args.cache_dir) if __name__ == '__main__': |