zuul
/
nodepool
Code Issues Proposed changes

Merge "Build nodepool with python3.8"

This commit is contained in:
Zuul 2020-05-06 23:09:33 +00:00 committed by Gerrit Code Review
parent d4651fe89d ad625b8d8c
commit 30c1ccb882
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.zuul.yaml
View File

@ -154,8 +154,8 @@
dependencies: dependencies:
- opendev-buildset-registry - opendev-buildset-registry
requires: requires:
- python-builder-3.7-container-image - python-builder-3.8-container-image
- python-base-3.7-container-image - python-base-3.8-container-image
provides: nodepool-container-image provides: nodepool-container-image
vars: &nodepool_image_vars vars: &nodepool_image_vars
docker_images: docker_images:
@ -183,8 +183,8 @@
parent: opendev-upload-docker-image parent: opendev-upload-docker-image
description: Build Docker images and upload to Docker Hub. description: Build Docker images and upload to Docker Hub.
requires: requires:
- python-builder-3.7-container-image - python-builder-3.8-container-image
- python-base-3.7-container-image - python-base-3.8-container-image
provides: nodepool-container-image provides: nodepool-container-image
vars: *nodepool_image_vars vars: *nodepool_image_vars
secrets: secrets:
@ -214,8 +214,8 @@
- openstack/diskimage-builder - openstack/diskimage-builder
- openstack/openstacksdk - openstack/openstacksdk
requires: requires:
- python-builder-3.7-container-image - python-builder-3.8-container-image
- python-base-3.7-container-image - python-base-3.8-container-image
provides: nodepool-siblings-container-image provides: nodepool-siblings-container-image
vars: vars:
zuul_work_dir: "{{ zuul.projects['opendev.org/zuul/nodepool'].src_dir }}" zuul_work_dir: "{{ zuul.projects['opendev.org/zuul/nodepool'].src_dir }}"

4
Dockerfile
View File

@ -13,14 +13,14 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
FROM docker.io/opendevorg/python-builder:3.7 as builder FROM docker.io/opendevorg/python-builder:3.8 as builder
# ============================================================================ # ============================================================================
ARG ZUUL_SIBLINGS="" ARG ZUUL_SIBLINGS=""
COPY . /tmp/src COPY . /tmp/src
RUN assemble RUN assemble
FROM docker.io/opendevorg/python-base:3.7 as nodepool-base FROM docker.io/opendevorg/python-base:3.8 as nodepool-base
# ============================================================================ # ============================================================================
COPY --from=builder /output/ /output COPY --from=builder /output/ /output