fix(gate): fix airship-shipyard-ubuntu job
Change-Id: I146c57bf39c7588eca3df486b4505584c333bf74 Signed-off-by: Tin Lam <tin@irrational.io>
This commit is contained in:
parent
15c829da7c
commit
87ae709fb2
10
.zuul.yaml
10
.zuul.yaml
|
@ -56,16 +56,13 @@
|
||||||
- zuul: openstack/openstack-helm-infra
|
- zuul: openstack/openstack-helm-infra
|
||||||
vars:
|
vars:
|
||||||
zuul_osh_infra_relative_path: ../openstack-helm-infra/
|
zuul_osh_infra_relative_path: ../openstack-helm-infra/
|
||||||
timeout: 3600
|
timeout: 7200
|
||||||
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-build.yaml
|
|
||||||
- tools/gate/playbooks/osh-infra-deploy-k8s.yaml
|
|
||||||
run: tools/gate/playbooks/airship-shipyard-check.yaml
|
|
||||||
post-run: tools/gate/playbooks/osh-infra-collect-logs.yaml
|
post-run: tools/gate/playbooks/osh-infra-collect-logs.yaml
|
||||||
required-projects:
|
required-projects:
|
||||||
- openstack/openstack-helm-infra
|
- openstack/openstack-helm-infra
|
||||||
|
nodeset: airship-shipyard-single-node
|
||||||
irrelevant-files:
|
irrelevant-files:
|
||||||
- ^.*\.rst$
|
- ^.*\.rst$
|
||||||
- ^doc/.*$
|
- ^doc/.*$
|
||||||
|
@ -74,7 +71,8 @@
|
||||||
- job:
|
- job:
|
||||||
name: airship-shipyard-ubuntu
|
name: airship-shipyard-ubuntu
|
||||||
parent: airship-shipyard-base
|
parent: airship-shipyard-base
|
||||||
nodeset: airship-shipyard-single-node
|
run: tools/gate/playbooks/airship-shipyard-check.yaml
|
||||||
|
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: airship-shipyard-tox-base
|
name: airship-shipyard-tox-base
|
||||||
|
|
|
@ -14,9 +14,18 @@
|
||||||
|
|
||||||
- hosts: primary
|
- hosts: primary
|
||||||
tasks:
|
tasks:
|
||||||
|
- name: Setup environment
|
||||||
|
shell: |
|
||||||
|
set -xe;
|
||||||
|
./tools/gate/scripts/000-environment-setup.sh
|
||||||
|
environment:
|
||||||
|
OSH_INFRA_PATH: "{{ zuul_osh_infra_relative_path | default('') }}"
|
||||||
|
args:
|
||||||
|
chdir: "{{ zuul_shipyard_relative_path | default(zuul.project.src_dir) }}"
|
||||||
|
|
||||||
- name: Build Charts
|
- name: Build Charts
|
||||||
shell: |
|
shell: |
|
||||||
set -xe;
|
set -xe;
|
||||||
./tools/gate/scripts/010-build-charts.sh
|
./tools/gate/scripts/010-build-charts.sh
|
||||||
args:
|
args:
|
||||||
chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"
|
chdir: "{{ zuul_shipyard_relative_path | default(zuul.project.src_dir) }}"
|
||||||
|
|
|
@ -33,4 +33,4 @@
|
||||||
roles:
|
roles:
|
||||||
- deploy-kubeadm-aio-node
|
- deploy-kubeadm-aio-node
|
||||||
tags:
|
tags:
|
||||||
- deploy-kubeadm-aio-node
|
- deploy-kubeadm-aio-node
|
||||||
|
|
|
@ -0,0 +1,32 @@
|
||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
# 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.
|
||||||
|
|
||||||
|
set -xe
|
||||||
|
|
||||||
|
sudo apt-get update
|
||||||
|
sudo apt-get install --no-install-recommends -y \
|
||||||
|
ca-certificates \
|
||||||
|
git \
|
||||||
|
make \
|
||||||
|
jq \
|
||||||
|
nmap \
|
||||||
|
curl \
|
||||||
|
uuid-runtime
|
||||||
|
|
||||||
|
CURRENT_DIR="$(pwd)"
|
||||||
|
: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
|
||||||
|
cd ${OSH_INFRA_PATH}
|
||||||
|
make dev-deploy setup-host
|
||||||
|
make dev-deploy k8s
|
||||||
|
cd ${CURRENT_DIR}
|
Loading…
Reference in New Issue