Merge "Switch to zuul-jobs docker build jobs"

2019-01-24 02:21:00 +00:00 · 2019-01-24 02:21:00 +00:00 · 3f9df89e74
commit 3f9df89e74
parent 5d9f619b1e d145e86f71
5 changed files with 5 additions and 40 deletions
--- a/.zuul.yaml
+++ b/.zuul.yaml
@ -41,49 +41,26 @@

 - job:
    name: system-config-build-image
-    description: |
-      Build a docker image.
-
-      See the `role documentation
-      <https://zuul-ci.org/docs/zuul-jobs/roles.html#role-build-docker-image>`_
-      for details.
+    parent: build-docker-image
    abstract: true
-    allowed-projects: openstack-infra/system-config
-    pre-run: playbooks/zuul/build-image/pre.yaml
-    run: playbooks/zuul/build-image/run.yaml

 - job:
    name: system-config-upload-image
-    parent: system-config-build-image
-    description: |
-      Build and upload a docker image.
-
-      See the `role documentation
-      <https://zuul-ci.org/docs/zuul-jobs/roles.html#role-upload-docker-image>`_
-      for details.
+    parent: upload-docker-image
    abstract: true
-    allowed-projects: openstack-infra/system-config
-    post-run: playbooks/zuul/build-image/upload.yaml
    secrets:
      name: docker_credentials
      secret: system-config-dockerhub
+      pass-to-parent: true

 - job:
    name: system-config-promote-image
-    description: |
-      Retag a previously-uploaded docker image.
-
-      See the `role documentation
-      <https://zuul-ci.org/docs/zuul-jobs/roles.html#role-promote-docker-image>`_
-      for details.
+    parent: promote-docker-image
    abstract: true
-    allowed-projects: openstack-infra/system-config
-    run: playbooks/zuul/build-image/promote.yaml
    secrets:
      name: docker_credentials
      secret: system-config-dockerhub
-    nodeset:
-      nodes: []
+      pass-to-parent: true

 # Jinja-init jobs
 - job:
--- a/playbooks/zuul/build-image/pre.yaml
+++ b/playbooks/zuul/build-image/pre.yaml
@ -1,3 +0,0 @@
- hosts: all
-  roles:
-    - install-docker
--- a/playbooks/zuul/build-image/promote.yaml
+++ b/playbooks/zuul/build-image/promote.yaml
@ -1,3 +0,0 @@
- hosts: localhost
-  roles:
-    - promote-docker-image
--- a/playbooks/zuul/build-image/run.yaml
+++ b/playbooks/zuul/build-image/run.yaml
@ -1,3 +0,0 @@
- hosts: all
-  roles:
-    - build-docker-image
--- a/playbooks/zuul/build-image/upload.yaml
+++ b/playbooks/zuul/build-image/upload.yaml
@ -1,3 +0,0 @@
- hosts: all
-  roles:
-    - upload-docker-image