From c65a93a895b64e68fbc9016fba894c826c712d40 Mon Sep 17 00:00:00 2001 From: Roman Gorshunov Date: Mon, 7 Oct 2019 18:59:30 +0200 Subject: [PATCH] Change URLs to opendev.org due to migration Change URLs from git.openstack.org & github.com to opendev.org due to the migration; wrap multiple LABELs into one. Change-Id: I240fa6f746bd1e424e5a2b7fd381903c46059ae5 --- charts/shipyard/Chart.yaml | 6 +++--- images/airflow/Dockerfile.opensuse_15 | 12 ++++++------ images/airflow/Dockerfile.ubuntu_xenial | 12 ++++++------ images/airflow/requirements.txt | 6 +++--- images/shipyard/Dockerfile.opensuse_15 | 12 ++++++------ images/shipyard/Dockerfile.ubuntu_xenial | 12 ++++++------ src/bin/shipyard_airflow/requirements.txt | 6 +++--- src/bin/shipyard_airflow/test-requirements.txt | 2 +- tools/helm_tk.sh | 2 +- 9 files changed, 35 insertions(+), 35 deletions(-) diff --git a/charts/shipyard/Chart.yaml b/charts/shipyard/Chart.yaml index d5739f79..b880116d 100644 --- a/charts/shipyard/Chart.yaml +++ b/charts/shipyard/Chart.yaml @@ -20,11 +20,11 @@ version: 0.1.0 keywords: - shipyard - airflow -home: https://github.com/openstack/airship-shipyard +home: https://opendev.org/airship/shipyard sources: - https://github.com/apache/incubator-airflow -- https://github.com/openstack/airship-shipyard/tree/master/charts/shipyard -- https://git.openstack.org/cgit/openstack/openstack-helm +- https://opendev.org/airship/shipyard/src/branch/master/charts/shipyard +- https://opendev.org/openstack/openstack-helm maintainers: - name: Airship engine: gotpl diff --git a/images/airflow/Dockerfile.opensuse_15 b/images/airflow/Dockerfile.opensuse_15 index 2e2566d1..6931f907 100644 --- a/images/airflow/Dockerfile.opensuse_15 +++ b/images/airflow/Dockerfile.opensuse_15 @@ -16,12 +16,12 @@ ARG FROM=opensuse/leap:15.1 FROM ${FROM} -LABEL org.opencontainers.image.authors='airship-discuss@lists.airshipit.org, irc://#airshipit@freenode' -LABEL org.opencontainers.image.url='https://airshipit.org' -LABEL org.opencontainers.image.documentation='https://airship-shipyard.readthedocs.org' -LABEL org.opencontainers.image.source='https://opendev.org/airship/shipyard' -LABEL org.opencontainers.image.vendor='The Airship Authors' -LABEL org.opencontainers.image.licenses='Apache-2.0' +LABEL org.opencontainers.image.authors='airship-discuss@lists.airshipit.org, irc://#airshipit@freenode' \ + org.opencontainers.image.url='https://airshipit.org' \ + org.opencontainers.image.documentation='https://airship-shipyard.readthedocs.org' \ + org.opencontainers.image.source='https://opendev.org/airship/shipyard' \ + org.opencontainers.image.vendor='The Airship Authors' \ + org.opencontainers.image.licenses='Apache-2.0' # Do not prompt user for choices on installation/configuration of packages # Set port 8080 for Airflow Web diff --git a/images/airflow/Dockerfile.ubuntu_xenial b/images/airflow/Dockerfile.ubuntu_xenial index 181d66bd..5ef8d435 100644 --- a/images/airflow/Dockerfile.ubuntu_xenial +++ b/images/airflow/Dockerfile.ubuntu_xenial @@ -16,12 +16,12 @@ ARG FROM=ubuntu:16.04 FROM ${FROM} -LABEL org.opencontainers.image.authors='airship-discuss@lists.airshipit.org, irc://#airshipit@freenode' -LABEL org.opencontainers.image.url='https://airshipit.org' -LABEL org.opencontainers.image.documentation='https://airship-shipyard.readthedocs.org' -LABEL org.opencontainers.image.source='https://opendev.org/airship/shipyard' -LABEL org.opencontainers.image.vendor='The Airship Authors' -LABEL org.opencontainers.image.licenses='Apache-2.0' +LABEL org.opencontainers.image.authors='airship-discuss@lists.airshipit.org, irc://#airshipit@freenode' \ + org.opencontainers.image.url='https://airshipit.org' \ + org.opencontainers.image.documentation='https://airship-shipyard.readthedocs.org' \ + org.opencontainers.image.source='https://opendev.org/airship/shipyard' \ + org.opencontainers.image.vendor='The Airship Authors' \ + org.opencontainers.image.licenses='Apache-2.0' # Do not prompt user for choices on installation/configuration of packages # Set port 8080 for Airflow Web diff --git a/images/airflow/requirements.txt b/images/airflow/requirements.txt index b42f2f2b..8c04604b 100644 --- a/images/airflow/requirements.txt +++ b/images/airflow/requirements.txt @@ -27,6 +27,6 @@ marshmallow-sqlalchemy==0.18.0 tabulate==0.8.03 # Dependencies for other UCP components -git+https://git.openstack.org/openstack/airship-deckhand@7e5d81f50f1f8c0d58d0973ae0b3065fd5b62451#egg=deckhand -git+https://git.openstack.org/openstack/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/deckhand.git@7e5d81f50f1f8c0d58d0973ae0b3065fd5b62451#egg=deckhand +git+https://opendev.org/airship/drydock.git@22a4f01cb7880828f7b955c56d53603b6170415a#egg=drydock_provisioner&subdirectory=python +git+https://opendev.org/airship/armada.git@af8a9ffd0873c2fbc915794e235dbd357f2adab1#egg=armada diff --git a/images/shipyard/Dockerfile.opensuse_15 b/images/shipyard/Dockerfile.opensuse_15 index 284d4139..b2bfeeb7 100644 --- a/images/shipyard/Dockerfile.opensuse_15 +++ b/images/shipyard/Dockerfile.opensuse_15 @@ -15,12 +15,12 @@ ARG FROM=opensuse/leap:15.1 FROM ${FROM} -LABEL org.opencontainers.image.authors='airship-discuss@lists.airshipit.org, irc://#airshipit@freenode' -LABEL org.opencontainers.image.url='https://airshipit.org' -LABEL org.opencontainers.image.documentation='https://airship-shipyard.readthedocs.org' -LABEL org.opencontainers.image.source='https://git.openstack.org/openstack/airship-shipyard' -LABEL org.opencontainers.image.vendor='The Airship Authors' -LABEL org.opencontainers.image.licenses='Apache-2.0' +LABEL org.opencontainers.image.authors='airship-discuss@lists.airshipit.org, irc://#airshipit@freenode' \ + org.opencontainers.image.url='https://airshipit.org' \ + org.opencontainers.image.documentation='https://airship-shipyard.readthedocs.org' \ + org.opencontainers.image.source='https://opendev.org/airship/shipyard' \ + org.opencontainers.image.vendor='The Airship Authors' \ + org.opencontainers.image.licenses='Apache-2.0' ENV container docker ENV PORT 9000 diff --git a/images/shipyard/Dockerfile.ubuntu_xenial b/images/shipyard/Dockerfile.ubuntu_xenial index 6c0ec774..05b1a60e 100644 --- a/images/shipyard/Dockerfile.ubuntu_xenial +++ b/images/shipyard/Dockerfile.ubuntu_xenial @@ -15,12 +15,12 @@ ARG FROM=ubuntu:16.04 FROM ${FROM} -LABEL org.opencontainers.image.authors='airship-discuss@lists.airshipit.org, irc://#airshipit@freenode' -LABEL org.opencontainers.image.url='https://airshipit.org' -LABEL org.opencontainers.image.documentation='https://airship-shipyard.readthedocs.org' -LABEL org.opencontainers.image.source='https://git.openstack.org/openstack/airship-shipyard' -LABEL org.opencontainers.image.vendor='The Airship Authors' -LABEL org.opencontainers.image.licenses='Apache-2.0' +LABEL org.opencontainers.image.authors='airship-discuss@lists.airshipit.org, irc://#airshipit@freenode' \ + org.opencontainers.image.url='https://airshipit.org' \ + org.opencontainers.image.documentation='https://airship-shipyard.readthedocs.org' \ + org.opencontainers.image.source='https://opendev.org/airship/shipyard' \ + org.opencontainers.image.vendor='The Airship Authors' \ + org.opencontainers.image.licenses='Apache-2.0' ENV container docker ENV PORT 9000 diff --git a/src/bin/shipyard_airflow/requirements.txt b/src/bin/shipyard_airflow/requirements.txt index 6b17283c..e0a12c1e 100644 --- a/src/bin/shipyard_airflow/requirements.txt +++ b/src/bin/shipyard_airflow/requirements.txt @@ -42,6 +42,6 @@ marshmallow-sqlalchemy==0.18.0 tabulate==0.8.03 # Dependencies for other UCP components -git+https://git.openstack.org/openstack/airship-deckhand@7e5d81f50f1f8c0d58d0973ae0b3065fd5b62451#egg=deckhand -git+https://git.openstack.org/openstack/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/deckhand.git@7e5d81f50f1f8c0d58d0973ae0b3065fd5b62451#egg=deckhand +git+https://opendev.org/airship/drydock.git@22a4f01cb7880828f7b955c56d53603b6170415a#egg=drydock_provisioner&subdirectory=python +git+https://opendev.org/airship/armada.git@af8a9ffd0873c2fbc915794e235dbd357f2adab1#egg=armada diff --git a/src/bin/shipyard_airflow/test-requirements.txt b/src/bin/shipyard_airflow/test-requirements.txt index c6229124..1cef59e4 100644 --- a/src/bin/shipyard_airflow/test-requirements.txt +++ b/src/bin/shipyard_airflow/test-requirements.txt @@ -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 # 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 flake8==3.3.0 diff --git a/tools/helm_tk.sh b/tools/helm_tk.sh index 7683a4ed..b38092f4 100755 --- a/tools/helm_tk.sh +++ b/tools/helm_tk.sh @@ -46,7 +46,7 @@ function helm_serve { mkdir -p 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 git reset --hard "${HTK_STABLE_COMMIT}"