Skip to content

Commit

Permalink
Switch to buildah on container build jobs
Browse files Browse the repository at this point in the history
Switch from docker to buildah on master/stein container build jobs
in the periodic pipeline. This change modifies the layout for the
jobs defined in the promotion pipeline, that is, old jobs named
as -build-push for master and stein branches are replaced with
-buildah suffix.

The jobs for rocky and older branches, docker remains with the
name -build-push suffix.

Jobs are defined in the trusted config at [1] and have been tested
in testproject [2].

[1] https://review.rdoproject.org/r/#/c/20000/
[2] https://review.rdoproject.org/r/#/c/20023/

Story: https://tree.taiga.io/project/tripleo-ci-board/us/815

Task #964: Add container build buildah jobs to promotion pipeline
(layout).

Change-Id: I48b4669dc8498bfbd844a6b705dcef5d12774657
  • Loading branch information
rafaelfolco committed Apr 9, 2019
1 parent 4cbaf3b commit d611d43
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 74 deletions.
76 changes: 38 additions & 38 deletions zuul.d/tripleo.yaml
Expand Up @@ -41,118 +41,118 @@
##### master #####
- periodic-tripleo-ci-centos-7-ovb-1ctlr_1comp-featureset002-master-upload:
dependencies:
- periodic-tripleo-centos-7-master-containers-build-push
- periodic-tripleo-centos-7-master-containers-buildah
- periodic-tripleo-ci-centos-7-ovb-3ctlr_1comp-featureset001-master:
dependencies:
- periodic-tripleo-centos-7-master-containers-build-push
- periodic-tripleo-centos-7-master-containers-buildah
- periodic-tripleo-ci-centos-7-multinode-1ctlr-featureset010-master:
dependencies:
- periodic-tripleo-centos-7-master-containers-build-push
- periodic-tripleo-centos-7-master-containers-buildah
- periodic-tripleo-ci-centos-7-ovb-1ctlr_1comp-featureset020-master:
dependencies:
- periodic-tripleo-centos-7-master-containers-build-push
- periodic-tripleo-centos-7-master-containers-buildah
- periodic-tripleo-ci-centos-7-ovb-1ctlr_1comp-featureset021-master:
dependencies:
- periodic-tripleo-centos-7-master-containers-build-push
- periodic-tripleo-centos-7-master-containers-buildah
- periodic-tripleo-ci-centos-7-singlenode-featureset027-master:
dependencies:
- periodic-tripleo-centos-7-master-containers-build-push
- periodic-tripleo-centos-7-master-containers-buildah
- periodic-tripleo-ci-centos-7-multinode-1ctlr-featureset030-master:
dependencies:
- periodic-tripleo-centos-7-master-containers-build-push
- periodic-tripleo-centos-7-master-containers-buildah
- periodic-tripleo-ci-centos-7-ovb-3ctlr_1comp-featureset035-master:
dependencies:
- periodic-tripleo-centos-7-master-containers-build-push
- periodic-tripleo-centos-7-master-containers-buildah
- periodic-tripleo-ci-centos-7-multinode-1ctlr-featureset037-updates-master:
dependencies:
- periodic-tripleo-centos-7-master-containers-build-push
- periodic-tripleo-centos-7-master-containers-buildah
- periodic-tripleo-ci-centos-7-ovb-3ctlr_1comp_1supp-featureset039-master:
dependencies:
- periodic-tripleo-centos-7-master-containers-build-push
- periodic-tripleo-centos-7-master-containers-buildah
- periodic-tripleo-ci-centos-7-singlenode-featureset050-upgrades-master:
dependencies:
- periodic-tripleo-centos-7-master-containers-build-push
- periodic-tripleo-centos-7-master-containers-buildah
- periodic-tripleo-ci-centos-7-standalone-master:
dependencies:
- periodic-tripleo-centos-7-master-containers-build-push
- periodic-tripleo-centos-7-master-containers-buildah
- periodic-tripleo-ci-fedora-28-standalone-master:
dependencies:
- periodic-tripleo-fedora-28-master-containers-build-push
- periodic-tripleo-fedora-28-master-containers-buildah
- periodic-tripleo-ci-centos-7-scenario001-standalone-master:
dependencies:
- periodic-tripleo-centos-7-master-containers-build-push
- periodic-tripleo-centos-7-master-containers-buildah
- periodic-tripleo-ci-centos-7-scenario002-standalone-master:
dependencies:
- periodic-tripleo-centos-7-master-containers-build-push
- periodic-tripleo-centos-7-master-containers-buildah
- periodic-tripleo-ci-centos-7-scenario003-standalone-master:
dependencies:
- periodic-tripleo-centos-7-master-containers-build-push
- periodic-tripleo-centos-7-master-containers-buildah
- periodic-tripleo-ci-centos-7-scenario004-standalone-master:
dependencies:
- periodic-tripleo-centos-7-master-containers-build-push
- periodic-tripleo-centos-7-master-containers-build-push:
- periodic-tripleo-centos-7-master-containers-buildah
- periodic-tripleo-centos-7-master-containers-buildah:
dependencies:
- periodic-tripleo-centos-7-master-promote-consistent-to-tripleo-ci-testing
- periodic-tripleo-fedora-28-master-containers-build-push:
- periodic-tripleo-fedora-28-master-containers-buildah:
dependencies:
- periodic-tripleo-centos-7-master-promote-consistent-to-tripleo-ci-testing
- periodic-tripleo-centos-7-master-promote-consistent-to-tripleo-ci-testing
##### stable/stein #####
- periodic-tripleo-ci-centos-7-ovb-1ctlr_1comp-featureset002-stein-upload:
dependencies:
- periodic-tripleo-centos-7-stein-containers-build-push
- periodic-tripleo-centos-7-stein-containers-buildah
- periodic-tripleo-ci-centos-7-ovb-3ctlr_1comp-featureset001-stein:
dependencies:
- periodic-tripleo-centos-7-stein-containers-build-push
- periodic-tripleo-centos-7-stein-containers-buildah
- periodic-tripleo-ci-centos-7-multinode-1ctlr-featureset010-stein:
dependencies:
- periodic-tripleo-centos-7-stein-containers-build-push
- periodic-tripleo-centos-7-stein-containers-buildah
- periodic-tripleo-ci-centos-7-ovb-1ctlr_1comp-featureset020-stein:
dependencies:
- periodic-tripleo-centos-7-stein-containers-build-push
- periodic-tripleo-centos-7-stein-containers-buildah
- periodic-tripleo-ci-centos-7-ovb-1ctlr_1comp-featureset021-stein:
dependencies:
- periodic-tripleo-centos-7-stein-containers-build-push
- periodic-tripleo-centos-7-stein-containers-buildah
- periodic-tripleo-ci-centos-7-singlenode-featureset027-stein:
dependencies:
- periodic-tripleo-centos-7-stein-containers-build-push
- periodic-tripleo-centos-7-stein-containers-buildah
- periodic-tripleo-ci-centos-7-multinode-1ctlr-featureset030-stein:
dependencies:
- periodic-tripleo-centos-7-stein-containers-build-push
- periodic-tripleo-centos-7-stein-containers-buildah
- periodic-tripleo-ci-centos-7-ovb-3ctlr_1comp-featureset035-stein:
dependencies:
- periodic-tripleo-centos-7-stein-containers-build-push
- periodic-tripleo-centos-7-stein-containers-buildah
- periodic-tripleo-ci-centos-7-multinode-1ctlr-featureset037-updates-stein:
dependencies:
- periodic-tripleo-centos-7-stein-containers-build-push
- periodic-tripleo-centos-7-stein-containers-buildah
- periodic-tripleo-ci-centos-7-ovb-3ctlr_1comp_1supp-featureset039-stein:
dependencies:
- periodic-tripleo-centos-7-stein-containers-build-push
- periodic-tripleo-centos-7-stein-containers-buildah
- periodic-tripleo-ci-centos-7-singlenode-featureset050-upgrades-stein:
dependencies:
- periodic-tripleo-centos-7-stein-containers-build-push
- periodic-tripleo-centos-7-stein-containers-buildah
- periodic-tripleo-ci-centos-7-standalone-stein:
dependencies:
- periodic-tripleo-centos-7-stein-containers-build-push
- periodic-tripleo-centos-7-stein-containers-buildah
- periodic-tripleo-ci-fedora-28-standalone-stein:
dependencies:
- periodic-tripleo-fedora-28-stein-containers-build-push
- periodic-tripleo-fedora-28-stein-containers-buildah
- periodic-tripleo-ci-centos-7-scenario001-standalone-stein:
dependencies:
- periodic-tripleo-centos-7-stein-containers-build-push
- periodic-tripleo-centos-7-stein-containers-buildah
- periodic-tripleo-ci-centos-7-scenario002-standalone-stein:
dependencies:
- periodic-tripleo-centos-7-stein-containers-build-push
- periodic-tripleo-centos-7-stein-containers-buildah
- periodic-tripleo-ci-centos-7-scenario003-standalone-stein:
dependencies:
- periodic-tripleo-centos-7-stein-containers-build-push
- periodic-tripleo-centos-7-stein-containers-buildah
- periodic-tripleo-ci-centos-7-scenario004-standalone-stein:
dependencies:
- periodic-tripleo-centos-7-stein-containers-build-push
- periodic-tripleo-centos-7-stein-containers-build-push:
- periodic-tripleo-centos-7-stein-containers-buildah
- periodic-tripleo-centos-7-stein-containers-buildah:
dependencies:
- periodic-tripleo-centos-7-stein-promote-consistent-to-tripleo-ci-testing
- periodic-tripleo-fedora-28-stein-containers-build-push:
- periodic-tripleo-fedora-28-stein-containers-buildah:
dependencies:
- periodic-tripleo-centos-7-stein-promote-consistent-to-tripleo-ci-testing
- periodic-tripleo-centos-7-stein-promote-consistent-to-tripleo-ci-testing
Expand Down
36 changes: 0 additions & 36 deletions zuul.d/tripleoci.yaml
Expand Up @@ -49,42 +49,6 @@
- rdo_registry
- dlrnapi

# TODO(rfolco): These jobs that build containers w/ docker for master and
# stein should go away as soon as the buildah ones (below) are running well
- job:
name: periodic-tripleo-centos-7-master-containers-build-push
parent: periodic-tripleo-containers-build-push-base
nodeset: single-centos-7-node
vars:
release: master

- job:
name: periodic-tripleo-fedora-28-master-containers-build-push
parent: periodic-tripleo-containers-build-push-base
nodeset: single-upstream-fedora-28-node
vars:
release: master

- job:
name: periodic-tripleo-centos-7-stein-containers-build-push
parent: periodic-tripleo-containers-build-push-base
nodeset: single-centos-7-node
override-checkout: 'stable/stein'
vars:
release: stein
branch_override: 'stable/stein'

- job:
name: periodic-tripleo-fedora-28-stein-containers-build-push
parent: periodic-tripleo-containers-build-push-base
nodeset: single-upstream-fedora-28-node
override-checkout: 'stable/stein'
vars:
release: stein
branch_override: 'stable/stein'

# --- end of master/stein docker build jobs

# buildah master/stein build jobs
- job:
name: periodic-tripleo-centos-7-master-containers-buildah
Expand Down

0 comments on commit d611d43

Please sign in to comment.