From 7646b85160d0a6510200cc87361f5b7134e1138f Mon Sep 17 00:00:00 2001 From: Jean-Philippe Evrard Date: Mon, 8 Oct 2018 15:17:04 +0200 Subject: [PATCH] Use the openstack-helm-lint job from central location This moves the job definitions into a single location, the zuul.d folder, like it is done in the openstack-helm-infra repository. The job playbooks and definitions of this repository will be moved away to the openstack-helm-infra repository in a later commit. This patch implements the first job reuse with the job openstack-helm-lint from openstack-helm-infra's repository. Change-Id: I233da952548d69f040771007455955131139e860 Depends-On: https://review.openstack.org/#/c/608662/ --- Makefile | 2 +- .zuul.yaml => zuul.d/jobs-openstack-helm.yaml | 58 ++--------------- zuul.d/project.yaml | 65 +++++++++++++++++++ 3 files changed, 72 insertions(+), 53 deletions(-) rename .zuul.yaml => zuul.d/jobs-openstack-helm.yaml (77%) create mode 100644 zuul.d/project.yaml diff --git a/Makefile b/Makefile index dd34aaaae0..444992954e 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ SHELL := /bin/bash TASK := build -EXCLUDES := helm-toolkit doc tests tools logs tmp +EXCLUDES := helm-toolkit doc tests tools logs tmp zuul.d CHARTS := helm-toolkit $(filter-out $(EXCLUDES), $(patsubst %/.,%,$(wildcard */.))) .PHONY: $(EXCLUDES) $(CHARTS) diff --git a/.zuul.yaml b/zuul.d/jobs-openstack-helm.yaml similarity index 77% rename from .zuul.yaml rename to zuul.d/jobs-openstack-helm.yaml index 7032501de7..48c27fa919 100644 --- a/.zuul.yaml +++ b/zuul.d/jobs-openstack-helm.yaml @@ -1,4 +1,6 @@ -# Copyright 2017 The Openstack-Helm Authors. +--- +# Copyright 2017, AT&T +# Copyright 2018, SUSE LINUX GmbH. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -12,57 +14,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -- project: - templates: - - publish-openstack-docs-pti - check: - jobs: - - openstack-helm-linter - - openstack-helm-dev-deploy-ceph-swift-ovs - - openstack-helm-dev-deploy-ceph-radosgw-ovs - - openstack-helm-dev-deploy-ceph-rbd-ovs - - openstack-helm-dev-deploy-nfs-ovs - - openstack-helm-dev-deploy-ceph-lb: - voting: false - - openstack-helm-dev-deploy-nfs-lb: - voting: false - - openstack-helm-dev-deploy-nfs-ldap: - voting: false - - openstack-helm-multinode-ubuntu: - voting: false - - openstack-helm-ironic-ubuntu: - voting: false - - openstack-helm-armada-fullstack-deploy: - voting: false - - openstack-helm-kolla-deploy-ceph-ovs - - openstack-helm-newton-loci-deploy-ceph: - voting: false - - openstack-helm-newton-kolla-deploy-ceph: - voting: false - - openstack-helm-pike-loci-deploy-ceph: - voting: false - - openstack-helm-pike-kolla-deploy-ceph: - voting: false - gate: - jobs: - - openstack-helm-linter - - openstack-helm-dev-deploy-ceph-swift-ovs - - openstack-helm-dev-deploy-ceph-radosgw-ovs - - openstack-helm-dev-deploy-ceph-rbd-ovs - - openstack-helm-dev-deploy-nfs-ovs - - openstack-helm-kolla-deploy-ceph-ovs - experimental: - jobs: - - openstack-helm-multinode-centos - # NOTE(lamt): Make fedora job experimental until issues with gates are resolved. - - openstack-helm-multinode-fedora - - openstack-helm-multinode-tempest - -- job: - name: openstack-helm-linter - run: tools/gate/playbooks/zuul-linter.yaml - nodeset: openstack-helm-single-node - +# OpenStack Helm jobs +# These will move with their playbooks inside the +# openstack-helm-infra repository - job: name: openstack-helm-functional irrelevant-files: diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml new file mode 100644 index 0000000000..a713ae0e01 --- /dev/null +++ b/zuul.d/project.yaml @@ -0,0 +1,65 @@ +--- +# Copyright 2018, SUSE LINUX GmbH. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# For having the full context, this file should be read +# with the openstack-helm-infra repository, where nodesets +# and jobs are defined. +# NOTE(evrardjp): Some jobs and playbooks haven't been +# migrated to openstack-helm-infra yet. +- project: + templates: + - publish-openstack-docs-pti + check: + jobs: + - openstack-helm-lint + - openstack-helm-dev-deploy-ceph-swift-ovs + - openstack-helm-dev-deploy-ceph-radosgw-ovs + - openstack-helm-dev-deploy-ceph-rbd-ovs + - openstack-helm-dev-deploy-nfs-ovs + - openstack-helm-dev-deploy-ceph-lb: + voting: false + - openstack-helm-dev-deploy-nfs-lb: + voting: false + - openstack-helm-dev-deploy-nfs-ldap: + voting: false + - openstack-helm-multinode-ubuntu: + voting: false + - openstack-helm-ironic-ubuntu: + voting: false + - openstack-helm-armada-fullstack-deploy: + voting: false + - openstack-helm-kolla-deploy-ceph-ovs + - openstack-helm-newton-loci-deploy-ceph: + voting: false + - openstack-helm-newton-kolla-deploy-ceph: + voting: false + - openstack-helm-pike-loci-deploy-ceph: + voting: false + - openstack-helm-pike-kolla-deploy-ceph: + voting: false + gate: + jobs: + - openstack-helm-lint + - openstack-helm-dev-deploy-ceph-swift-ovs + - openstack-helm-dev-deploy-ceph-radosgw-ovs + - openstack-helm-dev-deploy-ceph-rbd-ovs + - openstack-helm-dev-deploy-nfs-ovs + - openstack-helm-kolla-deploy-ceph-ovs + experimental: + jobs: + - openstack-helm-multinode-centos + # NOTE(lamt): Make fedora job experimental until issues with gates are resolved. + - openstack-helm-multinode-fedora + - openstack-helm-multinode-tempest