airship
/
deckhand
Code Issues Proposed changes

CI: Update OSH relative paths for OpenDev 

On April 19, OpenStack completed the migration from openstack.org to
opendev.org [0]. During this migration, Airship projects moved from the
"openstack" namespace to the "airship" namespace. This commit makes
preliminary updates to gate jobs to account for the migration and fixes
a broken integration gate.

[0] http://lists.openstack.org/pipermail/openstack-discuss/2019-April/005011.html

Change-Id: I9257b0adab21bcc7596a5898ac9160bc6d63c225
This commit is contained in:
Drew Walters 2019-04-22 18:39:36 +00:00
parent 229e2024cd
commit 080ba9f0ca
1 changed files with 48 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
.zuul.yaml
View File

@ -21,38 +21,38 @@
rtd_webhook_id: '38572' rtd_webhook_id: '38572'
check: check:
jobs: jobs:
- airship-deckhand-tox-py27-postgresql - deckhand-tox-py27-postgresql
- airship-deckhand-tox-py35-postgresql - deckhand-tox-py35-postgresql
- airship-deckhand-functional-uwsgi-py35: - deckhand-functional-uwsgi-py35:
voting: false voting: false
- airship-deckhand-functional-docker-py35 - deckhand-functional-docker-py35
- airship-deckhand-integration-uwsgi-py35: - deckhand-integration-uwsgi-py35:
voting: false voting: false
- airship-deckhand-integration-docker-py35 - deckhand-integration-docker-py35
- airship-deckhand-chart-build-gate - deckhand-chart-build-gate
- airship-deckhand-chart-build-latest-htk - deckhand-chart-build-latest-htk
- airship-deckhand-docker-build-gate - deckhand-docker-build-gate
gate: gate:
jobs: jobs:
- airship-deckhand-tox-py27-postgresql - deckhand-tox-py27-postgresql
- airship-deckhand-tox-py35-postgresql - deckhand-tox-py35-postgresql
- airship-deckhand-functional-docker-py35 - deckhand-functional-docker-py35
- airship-deckhand-integration-docker-py35 - deckhand-integration-docker-py35
- airship-deckhand-chart-build-gate - deckhand-chart-build-gate
- airship-deckhand-docker-build-gate - deckhand-docker-build-gate
post: post:
jobs: jobs:
- airship-deckhand-docker-publish - deckhand-docker-publish
- airship-deckhand-docker-tag - deckhand-docker-tag
- nodeset: - nodeset:
name: airship-deckhand-single-node name: deckhand-single-node
nodes: nodes:
- name: primary - name: primary
label: ubuntu-xenial label: ubuntu-xenial
- job: - job:
name: airship-deckhand-tox-py27-postgresql name: deckhand-tox-py27-postgresql
parent: openstack-tox-py27 parent: openstack-tox-py27
pre-run: pre-run:
- tools/gate/playbooks/install-postgresql.yaml - tools/gate/playbooks/install-postgresql.yaml
@ -60,7 +60,7 @@
tox_envlist: py27-postgresql tox_envlist: py27-postgresql
- job: - job:
name: airship-deckhand-tox-py35-postgresql name: deckhand-tox-py35-postgresql
parent: openstack-tox-py35 parent: openstack-tox-py35
pre-run: pre-run:
- tools/gate/playbooks/install-postgresql.yaml - tools/gate/playbooks/install-postgresql.yaml
@ -68,13 +68,13 @@
tox_envlist: py35-postgresql tox_envlist: py35-postgresql
- job: - job:
name: airship-deckhand-functional-uwsgi-py35 name: deckhand-functional-uwsgi-py35
description: | description: |
Run tox-based functional tests for the Airship Deckhand project using a Run tox-based functional tests for the Airship Deckhand project using a
minimalistic deployment consisting of uwsgi for Deckhand API and pifpaf minimalistic deployment consisting of uwsgi for Deckhand API and pifpaf
for ephemeral PostgreSQL DB, under cPython version 3.5. for ephemeral PostgreSQL DB, under cPython version 3.5.
run: tools/gate/playbooks/run-functional-tests-uwsgi.yaml run: tools/gate/playbooks/run-functional-tests-uwsgi.yaml
nodeset: airship-deckhand-single-node nodeset: deckhand-single-node
vars: vars:
tox_envlist: functional-dev tox_envlist: functional-dev
irrelevant-files: irrelevant-files:
@ -86,9 +86,9 @@
- ^deckhand/tests/unit/.*$ - ^deckhand/tests/unit/.*$
- job: - job:
name: airship-deckhand-functional-docker-base name: deckhand-functional-docker-base
description: | description: |
Base job for running airship-deckhand functional tests. Runs tests Base job for running deckhand functional tests. Runs tests
against Docker image generated from source code. against Docker image generated from source code.
roles: roles:
- zuul: openstack/openstack-helm-infra - zuul: openstack/openstack-helm-infra
@ -101,12 +101,12 @@
- openstack/openstack-helm-infra - openstack/openstack-helm-infra
- job: - job:
name: airship-deckhand-functional-docker-py35 name: deckhand-functional-docker-py35
description: | description: |
Run tox-based functional tests for the Airship Deckhand project under Run tox-based functional tests for the Airship Deckhand project under
cPython version 3.5. Uses tox with the ``functional-py35`` environment. cPython version 3.5. Uses tox with the ``functional-py35`` environment.
parent: airship-deckhand-functional-docker-base parent: deckhand-functional-docker-base
nodeset: airship-deckhand-single-node nodeset: deckhand-single-node
vars: vars:
tox_envlist: functional tox_envlist: functional
disable_keystone: true disable_keystone: true
@ -119,14 +119,14 @@
- ^deckhand/tests/unit/.*$ - ^deckhand/tests/unit/.*$
- job: - job:
name: airship-deckhand-integration-uwsgi-py35 name: deckhand-integration-uwsgi-py35
description: | description: |
Run tox-based integration tests for the Airship Deckhand project using a Run tox-based integration tests for the Airship Deckhand project using a
minimalistic deployment consisting of uwsgi for Deckhand API and pifpaf minimalistic deployment consisting of uwsgi for Deckhand API and pifpaf
for ephemeral PostgreSQL DB, under cPython version 3.5. for ephemeral PostgreSQL DB, under cPython version 3.5.
timeout: 3600 timeout: 3600
run: tools/gate/playbooks/run-integration-tests-uwsgi.yaml run: tools/gate/playbooks/run-integration-tests-uwsgi.yaml
nodeset: airship-deckhand-single-node nodeset: deckhand-single-node
irrelevant-files: irrelevant-files:
- ^.*\.rst$ - ^.*\.rst$
- ^doc/.*$ - ^doc/.*$
@ -138,35 +138,35 @@
disable_keystone: true disable_keystone: true
- job: - job:
name: airship-deckhand-chart-build-gate name: deckhand-chart-build-gate
description: | description: |
Build charts using pinned Helm toolkit. Build charts using pinned Helm toolkit.
timeout: 900 timeout: 900
run: tools/gate/playbooks/build-charts.yaml run: tools/gate/playbooks/build-charts.yaml
nodeset: airship-deckhand-single-node nodeset: deckhand-single-node
- job: - job:
name: airship-deckhand-chart-build-latest-htk name: deckhand-chart-build-latest-htk
description: | description: |
Build charts using latest Helm toolkit. Build charts using latest Helm toolkit.
voting: false voting: false
timeout: 900 timeout: 900
run: tools/gate/playbooks/build-charts.yaml run: tools/gate/playbooks/build-charts.yaml
nodeset: airship-deckhand-single-node nodeset: deckhand-single-node
vars: vars:
HTK_COMMIT: master HTK_COMMIT: master
- job: - job:
name: airship-deckhand-integration-docker-base name: deckhand-integration-docker-base
description: | description: |
Base job for running airship-deckhand integration tests. Runs tests Base job for running deckhand integration tests. Runs tests
against Docker image generated from source code. against Docker image generated from source code.
timeout: 3600 timeout: 3600
roles: roles:
- zuul: openstack/openstack-helm-infra - zuul: openstack/openstack-helm-infra
vars: vars:
zuul_osh_relative_path: ../openstack-helm/ zuul_osh_relative_path: ../../openstack/openstack-helm/
zuul_osh_infra_relative_path: ../openstack-helm-infra/ zuul_osh_infra_relative_path: ../../openstack/openstack-helm-infra/
pre-run: pre-run:
- tools/gate/playbooks/osh-infra-upgrade-host.yaml - tools/gate/playbooks/osh-infra-upgrade-host.yaml
- tools/gate/playbooks/osh-infra-deploy-docker.yaml - tools/gate/playbooks/osh-infra-deploy-docker.yaml
@ -181,20 +181,20 @@
- ^releasenotes/.*$ - ^releasenotes/.*$
- job: - job:
name: airship-deckhand-integration-docker-py35 name: deckhand-integration-docker-py35
description: | description: |
Run tox-based integration tests for the Airship Deckhand project under Run tox-based integration tests for the Airship Deckhand project under
cPython version 3.5. cPython version 3.5.
parent: airship-deckhand-integration-docker-base parent: deckhand-integration-docker-base
nodeset: openstack-helm-single-node nodeset: openstack-helm-single-node
vars: vars:
disable_keystone: false disable_keystone: false
- job: - job:
name: airship-deckhand-docker-build-gate name: deckhand-docker-build-gate
timeout: 1800 timeout: 1800
run: tools/gate/playbooks/docker-image-build.yaml run: tools/gate/playbooks/docker-image-build.yaml
nodeset: airship-deckhand-single-node nodeset: deckhand-single-node
irrelevant-files: &non-code-files-template irrelevant-files: &non-code-files-template
- ^.*\.rst$ - ^.*\.rst$
- ^doc/.*$ - ^doc/.*$
@ -209,16 +209,16 @@
patch_set: true patch_set: true
- job: - job:
name: airship-deckhand-docker-publish name: deckhand-docker-publish
description: | description: |
Runs on every merge, unless files in a dictionary below are changed. Runs on every merge, unless files in a dictionary below are changed.
Builds and publishes container images on quay.io with a set of tags Builds and publishes container images on quay.io with a set of tags
listed in vars section. Waits in Zuul queue for a node (VM) assignment. listed in vars section. Waits in Zuul queue for a node (VM) assignment.
timeout: 1800 timeout: 1800
run: tools/gate/playbooks/docker-image-build.yaml run: tools/gate/playbooks/docker-image-build.yaml
nodeset: airship-deckhand-single-node nodeset: deckhand-single-node
secrets: secrets:
- airship_deckhand_quay_creds - deckhand_quay_creds
irrelevant-files: *non-code-files-template irrelevant-files: *non-code-files-template
vars: vars:
publish: true publish: true
@ -229,7 +229,7 @@
static: static:
- latest - latest
- job: - job:
name: airship-deckhand-docker-tag name: deckhand-docker-tag
description: | description: |
Runs on every merge when files in a dictionalry below are changed, and Runs on every merge when files in a dictionalry below are changed, and
adds git commit id tag onto the container image published on quay.io, adds git commit id tag onto the container image published on quay.io,
@ -240,14 +240,14 @@
nodeset: nodeset:
nodes: [] nodes: []
secrets: secrets:
- airship_deckhand_quay_creds - deckhand_quay_creds
# file pattern here must be exactly the same as in # file pattern here must be exactly the same as in
# airship-deckhand-docker-publish job above, # deckhand-docker-publish job above,
# job will be executed on merge only when any of this files get changed # job will be executed on merge only when any of this files get changed
files: *non-code-files-template files: *non-code-files-template
- secret: - secret:
name: airship_deckhand_quay_creds name: deckhand_quay_creds
data: data:
username: !encrypted/pkcs1-oaep username: !encrypted/pkcs1-oaep
- eC+ZaBS1TN37yuvL2WoGkJQ8OFBSLiXxV0wAkH+2l9wLNjmT3QxwnjXTNSw883zEkE9C/ - eC+ZaBS1TN37yuvL2WoGkJQ8OFBSLiXxV0wAkH+2l9wLNjmT3QxwnjXTNSw883zEkE9C/