Migrates master to use direct upstream

We now move master to deploy from upstream.  That means we do not need
to build undercloud/overcloud images anymore.

Changes-Include:
 - Remove bash build scripts as we do not need to build anything
   other than the python package anymore
 - Remove building images or iso from build.py
 - Remove building of images and iso from Makefile
 - Rename/refactor deploy settings files for nosdn and odl.  The new
   convention is that the typical scenario names we use will deploy
   master.  We also support n-1 OS, so in that case we use the branch
   name for the "feature" in the scenario name: os-odl-queens-noha.
 - Tacker/Congress are disabled in settings files until we fix that with
   upstream.  Containers are now enabled by default.
 - Disable TLS for undercloud (was changed upstream to default enabled)
 - Fix environments docker directory for master THT (was changed upstream)
 - Includes fix for LP#1768901
 - Includes workaround for LP#1770692
 - Moves to docker.io for container images as it is more stable and
   should contain the same images
 - Removes the term 'common' from apex packaging for referencing the
   Python Apex package

Change-Id: If6b433860b3ff882686c78d0f24a2f0c52b9b57a
Signed-off-by: Tim Rozet <trozet@redhat.com>

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__':