From c7398b5485715e6b0333fba5566af4723fec4fe1 Mon Sep 17 00:00:00 2001 From: Madhukar Nayakbomman Date: Mon, 12 Mar 2018 16:24:11 -0700 Subject: [PATCH] Adding the right image tag for heat init container 1. changed image tag for heat init container 2. modified .gitreview file to point to contrail's gerrit 3. Removed .zuul.yaml file for now Change-Id: I33602b063888aa5c24cc0153fe9e3201b2a78d0c Partial-Bug: #1749018 --- .gitreview | 16 +- .zuul.yaml | 234 ------------------ .../overrides/backends/opencontrail/heat.yaml | 2 +- 3 files changed, 15 insertions(+), 237 deletions(-) delete mode 100644 .zuul.yaml diff --git a/.gitreview b/.gitreview index 2b029cf317..69a5c1322a 100644 --- a/.gitreview +++ b/.gitreview @@ -1,4 +1,16 @@ +# +# Copyright (c) 2013 Juniper Networks, Inc. All rights reserved. +# +# OpenContrail Code Review System +# +# Please visit opencontrail.org additional information. +# +# e.g. After changes are complete and commited to a local branch, do +# 'git review' to submit changeset to review.opencontrail.org Code Review +# (gerrit) System. +# [gerrit] -host=review.openstack.org +host=review.opencontrail.org port=29418 -project=openstack/openstack-helm.git +project=Juniper/openstack-helm.git +defaultbranch=master diff --git a/.zuul.yaml b/.zuul.yaml deleted file mode 100644 index f117af0d5d..0000000000 --- a/.zuul.yaml +++ /dev/null @@ -1,234 +0,0 @@ -# Copyright 2017 The Openstack-Helm Authors. -# -# 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. - -- project: - check: - jobs: - - openstack-helm-linter - - openstack-helm-dev-deploy-ceph-ovs: - irrelevant-files: - - ^.*\.rst$ - - ^doc/.*$ - - ^releasenotes/.*$ - - openstack-helm-dev-deploy-nfs-ovs: - irrelevant-files: - - ^.*\.rst$ - - ^doc/.*$ - - ^releasenotes/.*$ - - openstack-helm-dev-deploy-ceph-lb: - voting: false - irrelevant-files: - - ^.*\.rst$ - - ^doc/.*$ - - ^releasenotes/.*$ - - openstack-helm-dev-deploy-nfs-lb: - voting: false - irrelevant-files: - - ^.*\.rst$ - - ^doc/.*$ - - ^releasenotes/.*$ - - openstack-helm-multinode-ubuntu: - irrelevant-files: - - ^.*\.rst$ - - ^doc/.*$ - - ^releasenotes/.*$ - #NOTE(portdirect): Voting disabled until ipcalc package issue resolved. - - openstack-helm-multinode-centos: - voting: false - irrelevant-files: - - ^.*\.rst$ - - ^doc/.*$ - - ^releasenotes/.*$ - #NOTE(lamt): Make fedora job non-voting until issues with gates are resolved. - - openstack-helm-multinode-fedora: - voting: false - irrelevant-files: - - ^.*\.rst$ - - ^doc/.*$ - - ^releasenotes/.*$ - - openstack-helm-ironic-ubuntu: - voting: false - irrelevant-files: - - ^.*\.rst$ - - ^doc/.*$ - - ^releasenotes/.*$ - - openstack-helm-armada-fullstack-deploy: - voting: false - irrelevant-files: - - ^.*\.rst$ - - ^doc/.*$ - - ^releasenotes/.*$ - - openstack-helm-kolla-deploy-ceph-ovs: - irrelevant-files: - - ^.*\.rst$ - - ^doc/.*$ - - ^releasenotes/.*$ - - openstack-helm-ocata-loci-deploy-ceph: - voting: false - irrelevant-files: - - ^.*\.rst$ - - ^doc/.*$ - - ^releasenotes/.*$ - - openstack-helm-ocata-kolla-deploy-ceph: - voting: false - irrelevant-files: - - ^.*\.rst$ - - ^doc/.*$ - - ^releasenotes/.*$ - gate: - jobs: - - openstack-helm-linter: - irrelevant-files: - - ^.*\.rst$ - - ^doc/.*$ - - ^releasenotes/.*$ - - openstack-helm-dev-deploy-ceph-ovs: - irrelevant-files: - - ^.*\.rst$ - - ^doc/.*$ - - ^releasenotes/.*$ - - openstack-helm-dev-deploy-nfs-ovs: - irrelevant-files: - - ^.*\.rst$ - - ^doc/.*$ - - ^releasenotes/.*$ - - openstack-helm-multinode-ubuntu: - irrelevant-files: - - ^.*\.rst$ - - ^doc/.*$ - - ^releasenotes/.*$ - - openstack-helm-kolla-deploy-ceph-ovs: - irrelevant-files: - - ^.*\.rst$ - - ^doc/.*$ - - ^releasenotes/.*$ - -- job: - name: openstack-helm-linter - run: tools/gate/playbooks/zuul-linter.yaml - nodeset: openstack-helm-single-node - -- job: - name: openstack-helm-dev-deploy - timeout: 7200 - vars: - osh_neutron_backend: openvswitch - zuul_osh_infra_relative_path: ../openstack-helm-infra/ - pre-run: - - ../openstack-helm-infra/tools/gate/playbooks/osh-infra-upgrade-host.yaml - post-run: ../openstack-helm-infra/tools/gate/playbooks/osh-infra-collect-logs.yaml - required-projects: - - openstack/openstack-helm-infra - nodeset: openstack-helm-single-node - -- job: - name: openstack-helm-dev-deploy-ceph-ovs - parent: openstack-helm-dev-deploy - run: tools/gate/playbooks/dev-deploy-ceph.yaml - -- job: - name: openstack-helm-dev-deploy-nfs-ovs - parent: openstack-helm-dev-deploy - run: tools/gate/playbooks/dev-deploy-nfs.yaml - -- job: - name: openstack-helm-dev-deploy-ceph-lb - vars: - osh_neutron_backend: linuxbridge - zuul_osh_extra_helm_args_relative_path: --values=./tools/overrides/backends/networking/linuxbridge.yaml - parent: openstack-helm-dev-deploy - run: tools/gate/playbooks/dev-deploy-ceph.yaml - -- job: - name: openstack-helm-dev-deploy-nfs-lb - vars: - osh_neutron_backend: linuxbridge - zuul_osh_extra_helm_args_relative_path: --values=./tools/overrides/backends/networking/linuxbridge.yaml - parent: openstack-helm-dev-deploy - run: tools/gate/playbooks/dev-deploy-nfs.yaml - -- job: - name: openstack-helm-multinode - timeout: 7200 - vars: - zuul_osh_infra_relative_path: ../openstack-helm-infra/ - pre-run: - - ../openstack-helm-infra/tools/gate/playbooks/osh-infra-upgrade-host.yaml - - ../openstack-helm-infra/tools/gate/playbooks/osh-infra-deploy-docker.yaml - - ../openstack-helm-infra/tools/gate/playbooks/osh-infra-build.yaml - - ../openstack-helm-infra/tools/gate/playbooks/osh-infra-deploy-k8s.yaml - run: tools/gate/playbooks/multinode-deploy.yaml - post-run: ../openstack-helm-infra/tools/gate/playbooks/osh-infra-collect-logs.yaml - required-projects: - - openstack/openstack-helm-infra - -- job: - timeout: 9600 - vars: - zuul_osh_infra_relative_path: ../openstack-helm-infra/ - name: openstack-helm-armada-fullstack-deploy - pre-run: - - ../openstack-helm-infra/tools/gate/playbooks/osh-infra-upgrade-host.yaml - - ../openstack-helm-infra/tools/gate/playbooks/osh-infra-deploy-docker.yaml - - ../openstack-helm-infra/tools/gate/playbooks/osh-infra-build.yaml - - ../openstack-helm-infra/tools/gate/playbooks/osh-infra-deploy-k8s.yaml - run: tools/gate/playbooks/armada-fullstack-deploy.yaml - post-run: - - ../openstack-helm-infra/tools/gate/playbooks/osh-infra-collect-logs.yaml - - tools/gate/playbooks/gather-armada-manifests.yaml - required-projects: - - openstack/openstack-helm-infra - nodeset: openstack-helm-five-node-ubuntu - -- job: - name: openstack-helm-multinode-ubuntu - parent: openstack-helm-multinode - nodeset: openstack-helm-five-node-ubuntu - -- job: - name: openstack-helm-multinode-centos - parent: openstack-helm-multinode - nodeset: openstack-helm-five-node-centos - -- job: - name: openstack-helm-multinode-fedora - parent: openstack-helm-multinode - nodeset: openstack-helm-five-node-fedora - -- job: - name: openstack-helm-ironic-ubuntu - parent: openstack-helm-multinode - nodeset: openstack-helm-ubuntu - run: tools/gate/playbooks/ironic-deploy.yaml - -- job: - name: openstack-helm-kolla-deploy-ceph-ovs - vars: - zuul_osh_extra_helm_args_relative_path: --values=./tools/overrides/releases/newton/kolla.yaml - parent: openstack-helm-dev-deploy - run: tools/gate/playbooks/dev-deploy-ceph.yaml - -- job: - name: openstack-helm-ocata-loci-deploy-ceph - vars: - zuul_osh_extra_helm_args_relative_path: --values=./tools/overrides/releases/ocata/loci.yaml - parent: openstack-helm-dev-deploy - run: tools/gate/playbooks/dev-deploy-ceph.yaml - -- job: - name: openstack-helm-ocata-kolla-deploy-ceph - vars: - zuul_osh_extra_helm_args_relative_path: --values=./tools/overrides/releases/ocata/kolla.yaml - parent: openstack-helm-dev-deploy - run: tools/gate/playbooks/dev-deploy-ceph.yaml diff --git a/tools/overrides/backends/opencontrail/heat.yaml b/tools/overrides/backends/opencontrail/heat.yaml index 59e4185e7f..ffbb17d992 100644 --- a/tools/overrides/backends/opencontrail/heat.yaml +++ b/tools/overrides/backends/opencontrail/heat.yaml @@ -14,7 +14,7 @@ images: tags: - opencontrail_heat_init: docker.io/opencontrailnightly/contrail-openstack-heat-init:master-centos7-ocata-bld-13 + opencontrail_heat_init: docker.io/opencontrailnightly/contrail-openstack-heat-init:ocata-master-19 conf: heat: