Finalize the move from openstack-chef-repo to openstack-chef

Change-Id: Ie97fe2af2a068f5c4a970fb45f24c162b705860c
This commit is contained in:
Samuel Cassiba 2018-08-06 08:43:51 -07:00
parent af29db98a6
commit 5cf51b76f0
10 changed files with 32 additions and 33 deletions

View File

@ -1,4 +1,4 @@
[gerrit]
host=review.openstack.org
port=29418
project=openstack/openstack-chef-repo.git
project=openstack/openstack-chef.git

View File

@ -1,34 +1,34 @@
- job:
name: openstack-chef-repo-delivery
name: openstack-chef-delivery
parent: base
description: Run Chef Delivery tests with openstack-chef-repo
required-projects: openstack/openstack-chef-repo
description: Run Chef Delivery tests with openstack-chef
required-projects: openstack/openstack-chef
pre-run: playbooks/pre.yaml
run: playbooks/delivery.yaml
timeout: 2700
- job:
name: openstack-chef-repo-integration
name: openstack-chef-integration
parent: base
description: Run integration tests with openstack-chef-repo
required-projects: openstack/openstack-chef-repo
description: Run integration tests with openstack-chef
required-projects: openstack/openstack-chef
pre-run: playbooks/pre.yaml
run: playbooks/integration.yaml
post-run: playbooks/post.yaml
timeout: 3600
- project-template:
name: openstack-chef-repo-jobs
name: openstack-chef-jobs
check:
jobs:
- openstack-chef-repo-delivery
- openstack-chef-repo-integration
- openstack-chef-delivery
- openstack-chef-integration
gate:
jobs:
- openstack-chef-repo-delivery
- openstack-chef-repo-integration
- openstack-chef-delivery
- openstack-chef-integration
- project:
templates:
- build-openstack-sphinx-docs-python3
- openstack-chef-repo-jobs
- openstack-chef-jobs

View File

@ -1,7 +1,7 @@
Team and repository tags
========================
[![Team and repository tags](http://governance.openstack.org/badges/openstack-chef-repo.svg)](http://governance.openstack.org/reference/tags/index.html)
[![Team and repository tags](http://governance.openstack.org/badges/openstack-chef.svg)](http://governance.openstack.org/reference/tags/index.html)
<!-- Change things from this point on -->
@ -22,8 +22,7 @@ With the `master` branch of the cookbooks, which is currently tied to the base
OpenStack Ocata release, this supports deploying to Ubuntu 16.04 and CentOS 7
in monolithic, or allinone, and non-HA multinode configurations with Neutron.
The cookbooks support a fully HA configuration, but we do not test for that as
there are far numerous paths to
HA.
there are far numerous paths to HA.
## Prerequisites
@ -34,8 +33,8 @@ HA.
### Getting the Code (this repo)
```shell
$ git clone https://github.com/openstack/openstack-chef-repo.git
$ cd openstack-chef-repo
$ git clone https://github.com/openstack/openstack-chef.git
$ cd openstack-chef
```
The OpenStack cookbooks by default use encrypted data bags for configuring

View File

@ -86,7 +86,7 @@ source_suffix = '.rst'
master_doc = 'index'
# openstackdocstheme options
repository_name = 'openstack/openstack-chef-repo'
repository_name = 'openstack/openstack-chef'
bug_project = 'openstack-chef'
bug_tag = ''

View File

@ -6,7 +6,7 @@ Continuous Integration
This is a list of the CI jobs that are running against most of the Chef
OpenStack cookbooks. The code that configures Zuul jobs is hosted in
`openstack-chef-repo <https://git.openstack.org/cgit/openstack/openstack-chef-repo/tree/playbooks/>`_.
`openstack-chef <https://git.openstack.org/cgit/openstack/openstack-chef/tree/playbooks/>`_.
.. list-table:: **CI Jobs in Chef OpenStack**
:widths: 31 25 8 55
@ -16,11 +16,11 @@ OpenStack cookbooks. The code that configures Zuul jobs is hosted in
- Description
- Voting
- If it fails
* - openstack-chef-repo-rake
* - openstack-chef-rake
- It ensures the code follows the `Chef style guidelines <https://docs.chef.io/ruby.html>`_.
- Yes
- Read the build logs to see which part of the code does not follow the recommended patterns.
* - openstack-chef-repo-integration
* - openstack-chef-integration
- Functional testing job that converges OpenStack, testing using Tempest.
- Yes
- Read the build logs to see where the failure originated.

View File

@ -1,14 +1,14 @@
.. _quickstart-test-kitchen:
`Test Kitchen`_ is a no-fuss, no BS way to get a Chef OpenStack build for:
`Kitchen`_ is a no-fuss, no BS way to get a Chef OpenStack build for:
* development of OpenStack or applications on top of it
* a reference for how the services fit together
* a simple lab environment
.. _Test Kitchen: https://kitchen.ci/
.. _Kitchen: https://kitchen.ci/
Test Kitchen builds are not recommended for production deployments, but they can work in
Kitchen builds are not recommended for production deployments, but they can work in
a pinch when you just need OpenStack.
At an absolute minimum, you should use the following resources. What is listed
@ -62,9 +62,9 @@ Start by cloing the OpenStack chef-repo repository and changing into the root di
.. code-block:: shell-session
# git clone https://git.openstack.org/openstack/openstack-chef-repo \
/opt/openstack-chef-repo
# cd openstack-chef-repo
# git clone https://git.openstack.org/openstack/openstack-chef \
/opt/openstack-chef
# cd openstack-chef
Next, switch to the applicable branch/tag to be deployed. Note that deploying
from the head of a branch may result in an unstable build due to changes in

View File

@ -3,6 +3,6 @@
- name: run integration
shell:
cmd: chef exec rake integration
chdir: '{{ ansible_user_dir }}/src/git.openstack.org/openstack/openstack-chef-repo'
chdir: '{{ ansible_user_dir }}/src/git.openstack.org/openstack/openstack-chef'
environment:
WORKSPACE: '{{ ansible_user_dir }}'

View File

@ -2,7 +2,7 @@
roles:
- bindep
vars:
bindep_file: /home/zuul/src/git.openstack.org/openstack/openstack-chef-repo/bindep.txt
bindep_file: /home/zuul/src/git.openstack.org/openstack/openstack-chef/bindep.txt
- hosts: all
vars:

View File

@ -1,6 +1,6 @@
# # encoding: utf-8
# Inspec test for openstack-chef-repo
# Inspec test for openstack-chef
# The Inspec reference, with examples and extensive documentation, can be
# found at http://inspec.io/docs/reference/resources/

View File

@ -165,8 +165,8 @@ LONGDESC
end
end
run('git clone --depth 1 git@github.com:openstack/openstack-chef-repo.git') unless options[:skip]
Dir.chdir('openstack-chef-repo') do
run('git clone --depth 1 git@github.com:openstack/openstack-chef.git') unless options[:skip]
Dir.chdir('openstack-chef') do
ENV['ZUUL_CHANGES'] = options[:patches]
run('chef exec rake berks_vendor') unless options[:skip]