From 36304438eeb1fabee69a4c30a05b0a59bc7dbc2e Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Fri, 17 Nov 2017 08:43:45 -0600 Subject: [PATCH] Replace git:// with https:// git:// is not a secure protocol. It's also harder to do apache rewrite tricks and whatnot when we eventually flatten namespaces. Change occurances of git://git.openstack.org to https://git.openstack.org. Change-Id: Ic54f1b84346e37a76baa87deadbb540662889bca --- jenkins/scripts/check-osc-plugins.sh | 2 +- jenkins/scripts/common_translation_update.sh | 2 +- jenkins/scripts/project-requirements-change.py | 2 +- jenkins/scripts/propose_update.sh | 2 +- jenkins/scripts/release-tools/clone_repo.sh | 4 ++-- .../elements/cache-devstack/extra-data.d/50-early-source-repo | 2 +- .../elements/openstack-repos/extra-data.d/50-create-repo-list | 2 +- test-requirements.txt | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/jenkins/scripts/check-osc-plugins.sh b/jenkins/scripts/check-osc-plugins.sh index 823a971646..ef1ba3de5a 100755 --- a/jenkins/scripts/check-osc-plugins.sh +++ b/jenkins/scripts/check-osc-plugins.sh @@ -20,7 +20,7 @@ function install_from_source { repo=$1 root=$(mktemp -d) $zc --cache-dir /opt/git --workspace ${root} \ - git://git.openstack.org openstack/${repo} + https://git.openstack.org openstack/${repo} (cd ${root}/openstack/${repo} && $venv/bin/pip install .) rm -rf $root } diff --git a/jenkins/scripts/common_translation_update.sh b/jenkins/scripts/common_translation_update.sh index 5109cfd267..00506f1c43 100644 --- a/jenkins/scripts/common_translation_update.sh +++ b/jenkins/scripts/common_translation_update.sh @@ -390,7 +390,7 @@ function install_horizon { # Checkout same branch of horizon as the project - including # same constraints. git clone --depth=1 --branch $GIT_BRANCH \ - git://git.openstack.org/openstack/horizon.git $HORIZON_ROOT/horizon + https://git.openstack.org/openstack/horizon.git $HORIZON_ROOT/horizon (cd ${HORIZON_ROOT}/horizon && $VENV/bin/pip install -c $UPPER_CONSTRAINTS_FILE .) rm -rf HORIZON_ROOT HORIZON_ROOT="" diff --git a/jenkins/scripts/project-requirements-change.py b/jenkins/scripts/project-requirements-change.py index ae90ad7607..1fa57f979f 100755 --- a/jenkins/scripts/project-requirements-change.py +++ b/jenkins/scripts/project-requirements-change.py @@ -165,7 +165,7 @@ def main(): out, err = run_command("%(zc)s " "--cache-dir /opt/git " "--workspace %(root)s " - "git://git.openstack.org " + "https://git.openstack.org " "openstack/requirements" % dict(zc=zc, root=reqroot)) print(out) diff --git a/jenkins/scripts/propose_update.sh b/jenkins/scripts/propose_update.sh index ce8e860bfa..d2b16b9b55 100755 --- a/jenkins/scripts/propose_update.sh +++ b/jenkins/scripts/propose_update.sh @@ -114,7 +114,7 @@ for PROJECT in $PROJECTS; do # # TODO(fungi): switch to zuul-cloner once we add a persistent git cache # to proposal.slave.openstack.org - if ! git clone git://git.openstack.org/$PROJECT.git; then + if ! git clone https://git.openstack.org/$PROJECT.git; then # ALL_SUCCESS is being set to 1, which means that a failure condition # has been detected. The job will end in failure once it finishes # cycling through the remaining projects. diff --git a/jenkins/scripts/release-tools/clone_repo.sh b/jenkins/scripts/release-tools/clone_repo.sh index 15a764e31f..a15203c568 100755 --- a/jenkins/scripts/release-tools/clone_repo.sh +++ b/jenkins/scripts/release-tools/clone_repo.sh @@ -56,7 +56,7 @@ Options: --ref -- The git reference to check out. Defaults to HEAD. --upstream -- The upstream server URL, without the git repo - part. Defaults to git://git.openstack.org + part. Defaults to https://git.openstack.org EOF } @@ -66,7 +66,7 @@ WORKSPACE="." CACHE_DIR="${ZUUL_CACHE_DIR:-/opt/git}" BRANCH="master" REF="" -UPSTREAM="git://git.openstack.org" +UPSTREAM="https://git.openstack.org" OPTS=`getopt -o h --long branch:,cache-dir:,ref:,upstream:,workspace: -n $0 -- "$@"` if [ $? != 0 ] ; then diff --git a/nodepool/elements/cache-devstack/extra-data.d/50-early-source-repo b/nodepool/elements/cache-devstack/extra-data.d/50-early-source-repo index 7589ddc524..0c7b1c6b33 100755 --- a/nodepool/elements/cache-devstack/extra-data.d/50-early-source-repo +++ b/nodepool/elements/cache-devstack/extra-data.d/50-early-source-repo @@ -43,7 +43,7 @@ function get_devstack_from_cache { local REPONAME=devstack local REPOTYPE=git local REPOPATH=/opt/git/openstack-dev/devstack - local REPOLOCATION=git://git.openstack.org/openstack-dev/devstack.git + local REPOLOCATION=https://git.openstack.org/openstack-dev/devstack.git local REPOREF=master local REPO_DEST=$TMP_MOUNT_PATH$REPOPATH diff --git a/nodepool/elements/openstack-repos/extra-data.d/50-create-repo-list b/nodepool/elements/openstack-repos/extra-data.d/50-create-repo-list index 2157d10e93..b90d60529e 100755 --- a/nodepool/elements/openstack-repos/extra-data.d/50-create-repo-list +++ b/nodepool/elements/openstack-repos/extra-data.d/50-create-repo-list @@ -30,7 +30,7 @@ URL = ('https://git.openstack.org/cgit/openstack-infra/project-config/' TMP_HOOKS_PATH = os.environ['TMP_HOOKS_PATH'] PROJECTS_REPOS = os.path.join(TMP_HOOKS_PATH, 'source-repository-projects-yaml') -GIT_BASE = os.environ.get('GIT_BASE', 'git://git.openstack.org') +GIT_BASE = os.environ.get('GIT_BASE', 'https://git.openstack.org') CUSTOM_PROJECTS_LIST_URL = os.environ.get('DIB_CUSTOM_PROJECTS_LIST_URL') diff --git a/test-requirements.txt b/test-requirements.txt index d02dd5390b..11f251e21c 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1 +1 @@ --e git://git.openstack.org/openstack-infra/nodepool#egg=nodepool +-e https://git.openstack.org/openstack-infra/nodepool#egg=nodepool