airship/shipyard
Code Issues Proposed changes

Change URLs to opendev.org due to migration

Browse Source 
Change URLs from git.openstack.org & github.com to opendev.org due to the
migration; wrap multiple LABELs into one.

Change-Id: I240fa6f746bd1e424e5a2b7fd381903c46059ae5
This commit is contained in:
Roman Gorshunov 2019-10-07 18:59:30 +02:00
parent e6c7a6e1a5
commit c65a93a895
9 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
charts/shipyard/Chart.yaml
View File

@ -20,11 +20,11 @@ version: 0.1.0
keywords: keywords:
- shipyard - shipyard
- airflow - airflow
home: https://github.com/openstack/airship-shipyard home: https://opendev.org/airship/shipyard
sources: sources:
- https://github.com/apache/incubator-airflow - https://github.com/apache/incubator-airflow
- https://github.com/openstack/airship-shipyard/tree/master/charts/shipyard - https://opendev.org/airship/shipyard/src/branch/master/charts/shipyard
- https://git.openstack.org/cgit/openstack/openstack-helm - https://opendev.org/openstack/openstack-helm
maintainers: maintainers:
- name: Airship - name: Airship
engine: gotpl engine: gotpl

12
images/airflow/Dockerfile.opensuse_15
View File

@ -16,12 +16,12 @@
ARG FROM=opensuse/leap:15.1 ARG FROM=opensuse/leap:15.1
FROM ${FROM} FROM ${FROM}
LABEL org.opencontainers.image.authors='airship-discuss@lists.airshipit.org, irc://#airshipit@freenode' LABEL org.opencontainers.image.authors='airship-discuss@lists.airshipit.org, irc://#airshipit@freenode' \
LABEL org.opencontainers.image.url='https://airshipit.org' org.opencontainers.image.url='https://airshipit.org' \
LABEL org.opencontainers.image.documentation='https://airship-shipyard.readthedocs.org' org.opencontainers.image.documentation='https://airship-shipyard.readthedocs.org' \
LABEL org.opencontainers.image.source='https://opendev.org/airship/shipyard' org.opencontainers.image.source='https://opendev.org/airship/shipyard' \
LABEL org.opencontainers.image.vendor='The Airship Authors' org.opencontainers.image.vendor='The Airship Authors' \
LABEL org.opencontainers.image.licenses='Apache-2.0' org.opencontainers.image.licenses='Apache-2.0'
# Do not prompt user for choices on installation/configuration of packages # Do not prompt user for choices on installation/configuration of packages
# Set port 8080 for Airflow Web # Set port 8080 for Airflow Web

12
images/airflow/Dockerfile.ubuntu_xenial
View File

@ -16,12 +16,12 @@
ARG FROM=ubuntu:16.04 ARG FROM=ubuntu:16.04
FROM ${FROM} FROM ${FROM}
LABEL org.opencontainers.image.authors='airship-discuss@lists.airshipit.org, irc://#airshipit@freenode' LABEL org.opencontainers.image.authors='airship-discuss@lists.airshipit.org, irc://#airshipit@freenode' \
LABEL org.opencontainers.image.url='https://airshipit.org' org.opencontainers.image.url='https://airshipit.org' \
LABEL org.opencontainers.image.documentation='https://airship-shipyard.readthedocs.org' org.opencontainers.image.documentation='https://airship-shipyard.readthedocs.org' \
LABEL org.opencontainers.image.source='https://opendev.org/airship/shipyard' org.opencontainers.image.source='https://opendev.org/airship/shipyard' \
LABEL org.opencontainers.image.vendor='The Airship Authors' org.opencontainers.image.vendor='The Airship Authors' \
LABEL org.opencontainers.image.licenses='Apache-2.0' org.opencontainers.image.licenses='Apache-2.0'
# Do not prompt user for choices on installation/configuration of packages # Do not prompt user for choices on installation/configuration of packages
# Set port 8080 for Airflow Web # Set port 8080 for Airflow Web

6
images/airflow/requirements.txt
View File

@ -27,6 +27,6 @@ marshmallow-sqlalchemy==0.18.0
tabulate==0.8.03 tabulate==0.8.03
# Dependencies for other UCP components # Dependencies for other UCP components
git+https://git.openstack.org/openstack/airship-deckhand@7e5d81f50f1f8c0d58d0973ae0b3065fd5b62451#egg=deckhand git+https://opendev.org/airship/deckhand.git@7e5d81f50f1f8c0d58d0973ae0b3065fd5b62451#egg=deckhand
git+https://git.openstack.org/openstack/airship-drydock.git@22a4f01cb7880828f7b955c56d53603b6170415a#egg=drydock_provisioner&subdirectory=python git+https://opendev.org/airship/drydock.git@22a4f01cb7880828f7b955c56d53603b6170415a#egg=drydock_provisioner&subdirectory=python
git+https://git.openstack.org/openstack/airship-armada.git@af8a9ffd0873c2fbc915794e235dbd357f2adab1#egg=armada git+https://opendev.org/airship/armada.git@af8a9ffd0873c2fbc915794e235dbd357f2adab1#egg=armada

12
images/shipyard/Dockerfile.opensuse_15
View File

@ -15,12 +15,12 @@
ARG FROM=opensuse/leap:15.1 ARG FROM=opensuse/leap:15.1
FROM ${FROM} FROM ${FROM}
LABEL org.opencontainers.image.authors='airship-discuss@lists.airshipit.org, irc://#airshipit@freenode' LABEL org.opencontainers.image.authors='airship-discuss@lists.airshipit.org, irc://#airshipit@freenode' \
LABEL org.opencontainers.image.url='https://airshipit.org' org.opencontainers.image.url='https://airshipit.org' \
LABEL org.opencontainers.image.documentation='https://airship-shipyard.readthedocs.org' org.opencontainers.image.documentation='https://airship-shipyard.readthedocs.org' \
LABEL org.opencontainers.image.source='https://git.openstack.org/openstack/airship-shipyard' org.opencontainers.image.source='https://opendev.org/airship/shipyard' \
LABEL org.opencontainers.image.vendor='The Airship Authors' org.opencontainers.image.vendor='The Airship Authors' \
LABEL org.opencontainers.image.licenses='Apache-2.0' org.opencontainers.image.licenses='Apache-2.0'
ENV container docker ENV container docker
ENV PORT 9000 ENV PORT 9000

12
images/shipyard/Dockerfile.ubuntu_xenial
View File

@ -15,12 +15,12 @@
ARG FROM=ubuntu:16.04 ARG FROM=ubuntu:16.04
FROM ${FROM} FROM ${FROM}
LABEL org.opencontainers.image.authors='airship-discuss@lists.airshipit.org, irc://#airshipit@freenode' LABEL org.opencontainers.image.authors='airship-discuss@lists.airshipit.org, irc://#airshipit@freenode' \
LABEL org.opencontainers.image.url='https://airshipit.org' org.opencontainers.image.url='https://airshipit.org' \
LABEL org.opencontainers.image.documentation='https://airship-shipyard.readthedocs.org' org.opencontainers.image.documentation='https://airship-shipyard.readthedocs.org' \
LABEL org.opencontainers.image.source='https://git.openstack.org/openstack/airship-shipyard' org.opencontainers.image.source='https://opendev.org/airship/shipyard' \
LABEL org.opencontainers.image.vendor='The Airship Authors' org.opencontainers.image.vendor='The Airship Authors' \
LABEL org.opencontainers.image.licenses='Apache-2.0' org.opencontainers.image.licenses='Apache-2.0'
ENV container docker ENV container docker
ENV PORT 9000 ENV PORT 9000

6
src/bin/shipyard_airflow/requirements.txt
View File

@ -42,6 +42,6 @@ marshmallow-sqlalchemy==0.18.0
tabulate==0.8.03 tabulate==0.8.03
# Dependencies for other UCP components # Dependencies for other UCP components
git+https://git.openstack.org/openstack/airship-deckhand@7e5d81f50f1f8c0d58d0973ae0b3065fd5b62451#egg=deckhand git+https://opendev.org/airship/deckhand.git@7e5d81f50f1f8c0d58d0973ae0b3065fd5b62451#egg=deckhand
git+https://git.openstack.org/openstack/airship-drydock.git@22a4f01cb7880828f7b955c56d53603b6170415a#egg=drydock_provisioner&subdirectory=python git+https://opendev.org/airship/drydock.git@22a4f01cb7880828f7b955c56d53603b6170415a#egg=drydock_provisioner&subdirectory=python
git+https://git.openstack.org/openstack/airship-armada.git@af8a9ffd0873c2fbc915794e235dbd357f2adab1#egg=armada git+https://opendev.org/airship/armada.git@af8a9ffd0873c2fbc915794e235dbd357f2adab1#egg=armada

2
src/bin/shipyard_airflow/test-requirements.txt
View File

@ -8,7 +8,7 @@ apache-airflow[crypto,celery,postgres,hive,hdfs,jdbc]==1.10.1
# TODO(bryan-strassner) Pin to version for airflow when added to the # TODO(bryan-strassner) Pin to version for airflow when added to the
# requirements.txt in the airflow images directory # requirements.txt in the airflow images directory
git+https://git.openstack.org/openstack/airship-promenade.git@master#egg=promenade git+https://opendev.org/airship/promenade.git@master#egg=promenade
# Linting # Linting
flake8==3.3.0 flake8==3.3.0

2
tools/helm_tk.sh
View File

@ -46,7 +46,7 @@ function helm_serve {
mkdir -p build mkdir -p build
cd build cd build
git clone --depth 1 https://git.openstack.org/openstack/openstack-helm-infra.git || true git clone --depth 1 https://opendev.org/openstack/openstack-helm-infra.git || true
cd openstack-helm-infra cd openstack-helm-infra
git reset --hard "${HTK_STABLE_COMMIT}" git reset --hard "${HTK_STABLE_COMMIT}"