Browse Source

Merge "airskiff: Pull rather than build Airship images"

changes/10/622610/27
Zuul 2 years ago
committed by Gerrit Code Review
parent
commit
60d46debca
  1. 8
      doc/source/airskiff.rst
  2. 19
      tools/deployment/airskiff/developer/005-clone-dependencies.sh
  3. 6
      tools/deployment/airskiff/manifests/airship.yaml
  4. 21
      tools/gate/playbooks/airskiff-deploy-gate.yaml

8
doc/source/airskiff.rst

@ -97,10 +97,10 @@ Restart your shell session
At this point, restart your shell session to complete adding ``$USER`` to the
``docker`` group.
Build Airship components
~~~~~~~~~~~~~~~~~~~~~~~~
Clone Dependencies
~~~~~~~~~~~~~~~~~~
.. literalinclude:: ../../tools/deployment/airskiff/developer/005-make-airship.sh
.. literalinclude:: ../../tools/deployment/airskiff/developer/005-clone-dependencies.sh
:language: shell
:lines: 1,18-
@ -108,7 +108,7 @@ Alternatively, this step can be performed by running the script directly:
.. code-block:: shell
./tools/deployment/airskiff/developer/005-make-airship.sh
./tools/deployment/airskiff/developer/005-clone-dependencies.sh
Deploy Kubernetes with KubeADM
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

19
tools/deployment/airskiff/developer/005-make-airship.sh → tools/deployment/airskiff/developer/005-clone-dependencies.sh

@ -17,31 +17,22 @@
set -xe
# NOTE(drewwalters96): Build Airship components locally, for use as a
# as a development environment.
CURRENT_DIR="$(pwd)"
: "${INSTALL_PATH:="../"}"
: "${OSH_INFRA_COMMIT:="ef3adc4d0e5d26e74590d2f78400f7e1d800dbcb"}"
cd ${INSTALL_PATH}
git clone https://git.openstack.org/openstack/airship-armada.git
cd airship-armada && make images
cd ${INSTALL_PATH}
# Clone Airship projects
git clone https://git.openstack.org/openstack/airship-armada.git
git clone https://git.openstack.org/openstack/airship-deckhand.git
cd airship-deckhand && make
cd ${INSTALL_PATH}
git clone https://git.openstack.org/openstack/airship-shipyard.git
cd airship-shipyard && make
cd ${INSTALL_PATH}
git clone https://git.openstack.org/openstack/airship-pegleg.git
git clone https://git.openstack.org/openstack/airship-shipyard.git
# Clone dependencies
git clone https://git.openstack.org/openstack/openstack-helm-infra.git
cd openstack-helm-infra
git checkout ef3adc4d0e5d26e74590d2f78400f7e1d800dbcb
git checkout "${OSH_INFRA_COMMIT}"
cd "${CURRENT_DIR}"

6
tools/deployment/airskiff/manifests/airship.yaml

@ -283,12 +283,6 @@ data:
labels:
release_group: airship-shipyard
values:
images:
tags:
shipyard: 'quay.io/airshipit/shipyard:untagged'
shipyard_db_sync: 'quay.io/airshipit/shipyard:untagged'
airflow: 'quay.io/airshipit/airflow:untagged'
airflow_db_sync: 'quay.io/airshipit/airflow:untagged'
pod:
replicas:
shipyard:

21
tools/gate/playbooks/airskiff-deploy-gate.yaml

@ -21,27 +21,6 @@
chdir: "{{ zuul.project.src_dir }}"
become: yes
- name: Build Armada
shell: |
make images
args:
chdir: "{{ zuul.projects['git.openstack.org/openstack/airship-armada'].src_dir }}"
become: yes
- name: Build Deckhand
shell: |
make
args:
chdir: "{{ zuul.projects['git.openstack.org/openstack/airship-deckhand'].src_dir }}"
become: yes
- name: Build Shipyard
shell: |
make
args:
chdir: "{{ zuul.projects['git.openstack.org/openstack/airship-shipyard'].src_dir }}"
become: yes
- name: Deploy Kubernetes with KubeADM
shell: |
./tools/deployment/airskiff/developer/010-deploy-k8s.sh

Loading…
Cancel
Save