Merge "airskiff: Pull rather than build Airship images"

This commit is contained in:
Zuul 2019-03-22 19:32:30 +00:00 committed by Gerrit Code Review
commit 60d46debca
4 changed files with 9 additions and 45 deletions

View File

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

View File

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

View File

@ -283,12 +283,6 @@ data:
labels: labels:
release_group: airship-shipyard release_group: airship-shipyard
values: 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: pod:
replicas: replicas:
shipyard: shipyard:

View File

@ -21,27 +21,6 @@
chdir: "{{ zuul.project.src_dir }}" chdir: "{{ zuul.project.src_dir }}"
become: yes 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 - name: Deploy Kubernetes with KubeADM
shell: | shell: |
./tools/deployment/airskiff/developer/010-deploy-k8s.sh ./tools/deployment/airskiff/developer/010-deploy-k8s.sh