CI: Update jobs 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 change removes
the "armada-" prefix from all jobs to reflect the new repository name
and fixes the Airskiff check job to use the correct OSH-infra relative
path.

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

Change-Id: I7f261bb36676be9b8039778d87758186bfc94c65
This commit is contained in:
Drew Walters 2019-04-23 19:26:17 +00:00
parent 573b3885e0
commit b881e176f5
2 changed files with 23 additions and 20 deletions

View File

@ -21,49 +21,49 @@
check: check:
jobs: jobs:
- openstack-tox-pep8 - openstack-tox-pep8
- airship-armada-chart-build-gate - armada-chart-build-gate
- airship-armada-chart-build-latest-htk - armada-chart-build-latest-htk
- airship-armada-docker-build-gate - armada-docker-build-gate
- airship-treasuremap-airskiff-deploy - armada-airskiff-deploy
gate: gate:
jobs: jobs:
- openstack-tox-pep8 - openstack-tox-pep8
- airship-armada-chart-build-gate - armada-chart-build-gate
- airship-armada-docker-build-gate - armada-docker-build-gate
post: post:
jobs: jobs:
- airship-armada-docker-publish - armada-docker-publish
- nodeset: - nodeset:
name: airship-armada-single-node name: armada-single-node
nodes: nodes:
- name: primary - name: primary
label: ubuntu-xenial label: ubuntu-xenial
- job: - job:
name: airship-armada-chart-build-gate name: armada-chart-build-gate
description: | description: |
Builds Armada and Tiller charts using pinned Helm toolkit. Builds Armada and Tiller 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-armada-single-node nodeset: armada-single-node
- job: - job:
name: airship-armada-chart-build-latest-htk name: armada-chart-build-latest-htk
description: | description: |
Builds Armada and Tiller charts using latest Helm toolkit. Builds Armada and Tiller charts using latest Helm toolkit.
timeout: 900 timeout: 900
voting: false voting: false
run: tools/gate/playbooks/build-charts.yaml run: tools/gate/playbooks/build-charts.yaml
nodeset: airship-armada-single-node nodeset: armada-single-node
vars: vars:
HTK_COMMIT: master HTK_COMMIT: master
- job: - job:
name: airship-armada-docker-build-gate name: armada-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-armada-single-node nodeset: armada-single-node
vars: vars:
publish: false publish: false
tags: tags:
@ -71,8 +71,8 @@
patch_set: true patch_set: true
- job: - job:
name: airship-treasuremap-airskiff-deploy name: armada-airskiff-deploy
nodeset: airship-armada-single-node nodeset: armada-single-node
description: | description: |
Deploy Memcached using Airskiff and submitted Armada changes. Deploy Memcached using Airskiff and submitted Armada changes.
timeout: 9600 timeout: 9600
@ -88,6 +88,8 @@
- airship/shipyard - airship/shipyard
- airship/treasuremap - airship/treasuremap
- openstack/openstack-helm-infra - openstack/openstack-helm-infra
vars:
OSH_INFRA_PATH: "../../openstack/openstack-helm-infra"
irrelevant-files: irrelevant-files:
- ^.*\.rst$ - ^.*\.rst$
- ^doc/.*$ - ^doc/.*$
@ -96,12 +98,12 @@
- ^swagger/.*$ - ^swagger/.*$
- job: - job:
name: airship-armada-docker-publish name: armada-docker-publish
timeout: 1800 timeout: 1800
run: tools/gate/playbooks/docker-image-build.yaml run: tools/gate/playbooks/docker-image-build.yaml
nodeset: airship-armada-single-node nodeset: armada-single-node
secrets: secrets:
- airship_armada_quay_creds - armada_quay_creds
vars: vars:
publish: true publish: true
tags: tags:
@ -112,7 +114,7 @@
- latest - latest
- secret: - secret:
name: airship_armada_quay_creds name: armada_quay_creds
data: data:
username: !encrypted/pkcs1-oaep username: !encrypted/pkcs1-oaep
- mQ5xMKaU6+ug5Zp+LK5hfwbFamnW9hK2QVQOA7ylcoTMh8yz66YcgDjGJjbT2c66NF8eg - mQ5xMKaU6+ug5Zp+LK5hfwbFamnW9hK2QVQOA7ylcoTMh8yz66YcgDjGJjbT2c66NF8eg

View File

@ -30,6 +30,7 @@
- name: Deploy Kubernetes with Minikube - name: Deploy Kubernetes with Minikube
shell: | shell: |
export OSH_INFRA_PATH={{ OSH_INFRA_PATH }}
./tools/deployment/airskiff/developer/010-deploy-k8s.sh ./tools/deployment/airskiff/developer/010-deploy-k8s.sh
args: args:
chdir: "{{ zuul.projects['opendev.org/airship/treasuremap'].src_dir }}" chdir: "{{ zuul.projects['opendev.org/airship/treasuremap'].src_dir }}"