From d2913d4bcc0fcd25dc3d01f6604049dfd0a9217d Mon Sep 17 00:00:00 2001 From: Tim Rozet Date: Wed, 2 May 2018 12:34:38 -0400 Subject: 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 --- apex/builders/common_builder.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'apex/builders/common_builder.py') diff --git a/apex/builders/common_builder.py b/apex/builders/common_builder.py index 05a81efe..0cd683c3 100644 --- a/apex/builders/common_builder.py +++ b/apex/builders/common_builder.py @@ -25,7 +25,7 @@ from apex.virtual import utils as virt_utils def project_to_path(project): """ - Translates project to absolute file path + Translates project to absolute file path to use in patching :param project: name of project :return: File path """ @@ -36,8 +36,12 @@ def project_to_path(project): elif 'tripleo-heat-templates' in project: return "/usr/share/openstack-tripleo-heat-templates" else: - # assume python - return "/usr/lib/python2.7/site-packages/{}".format(project) + # assume python. python patches will apply to a project name subdir. + # For example, python-tripleoclient patch will apply to the + # tripleoclient directory, which is the directory extracted during + # python install into the PYTHONPATH. Therefore we need to just be + # in the PYTHONPATH directory to apply a patch + return "/usr/lib/python2.7/site-packages/" def project_to_docker_image(project): @@ -120,7 +124,7 @@ def add_upstream_patches(patches, image, tmp_dir, "ADD {} {}".format(patch_file, project_path), "RUN patch -p1 < {}".format(patch_file) ] - src_img_uri = "{}:8787/{}/centos-binary-{}:" \ + src_img_uri = "{}:8787/tripleo{}/centos-binary-{}:" \ "{}".format(uc_ip, os_version, service, docker_tag) oc_builder.build_dockerfile(service, tmp_dir, docker_cmds, -- cgit 1.2.3-korg