summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/source/troubleshooting-guide.rst6
-rwxr-xr-xmagnum/tests/contrib/gate_hook.sh6
-rw-r--r--playbooks/magnum-buildimages-base.yaml2
-rw-r--r--playbooks/magnum-tox-migration.yaml2
-rw-r--r--playbooks/pre/prepare-workspace.yaml2
5 files changed, 9 insertions, 9 deletions
diff --git a/doc/source/troubleshooting-guide.rst b/doc/source/troubleshooting-guide.rst
index b5c5ac0..eec0464 100644
--- a/doc/source/troubleshooting-guide.rst
+++ b/doc/source/troubleshooting-guide.rst
@@ -741,7 +741,7 @@ Simulating gate tests
741 dest: devstack-gate 741 dest: devstack-gate
742 EOF 742 EOF
743 /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \ 743 /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
744 git://git.openstack.org \ 744 https://git.openstack.org \
745 openstack-infra/devstack-gate 745 openstack-infra/devstack-gate
746 export PYTHONUNBUFFERED=true 746 export PYTHONUNBUFFERED=true
747 export DEVSTACK_GATE_TIMEOUT=240 # bump this if you see timeout issues. Default is 120 747 export DEVSTACK_GATE_TIMEOUT=240 # bump this if you see timeout issues. Default is 120
@@ -756,8 +756,8 @@ Simulating gate tests
756 export PROJECTS="openstack/magnum $PROJECTS" 756 export PROJECTS="openstack/magnum $PROJECTS"
757 export PROJECTS="openstack/python-magnumclient $PROJECTS" 757 export PROJECTS="openstack/python-magnumclient $PROJECTS"
758 export PROJECTS="openstack/barbican $PROJECTS" 758 export PROJECTS="openstack/barbican $PROJECTS"
759 export DEVSTACK_LOCAL_CONFIG="enable_plugin magnum git://git.openstack.org/openstack/magnum stable/ocata" 759 export DEVSTACK_LOCAL_CONFIG="enable_plugin magnum https://git.openstack.org/openstack/magnum stable/ocata"
760 export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer stable/ocata" 760 export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ceilometer https://git.openstack.org/openstack/ceilometer stable/ocata"
761 # Keep localrc to be able to set some vars in post_test_hook 761 # Keep localrc to be able to set some vars in post_test_hook
762 export KEEP_LOCALRC=1 762 export KEEP_LOCALRC=1
763 function gate_hook { 763 function gate_hook {
diff --git a/magnum/tests/contrib/gate_hook.sh b/magnum/tests/contrib/gate_hook.sh
index dbaf9a5..3315148 100755
--- a/magnum/tests/contrib/gate_hook.sh
+++ b/magnum/tests/contrib/gate_hook.sh
@@ -19,7 +19,7 @@ coe=$1
19special=$2 19special=$2
20 20
21export PROJECTS="openstack/barbican $PROJECTS" 21export PROJECTS="openstack/barbican $PROJECTS"
22export DEVSTACK_LOCAL_CONFIG="enable_plugin heat git://git.openstack.org/openstack/heat stable/ocata" 22export DEVSTACK_LOCAL_CONFIG="enable_plugin heat https://git.openstack.org/openstack/heat stable/ocata"
23 23
24export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service horizon" 24export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service horizon"
25export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service s-account" 25export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service s-account"
@@ -52,7 +52,7 @@ elif [ "${coe}${special}" = "k8s-ironic" ]; then
52 # NOTE(strigazi) keep cinder 52 # NOTE(strigazi) keep cinder
53 # export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service cinder c-sch c-api c-vol" 53 # export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service cinder c-sch c-api c-vol"
54 54
55 export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ironic git://git.openstack.org/openstack/ironic stable/ocata" 55 export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ironic https://git.openstack.org/openstack/ironic stable/ocata"
56 56
57 export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_DEPLOY_DRIVER=pxe_ssh" 57 export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_DEPLOY_DRIVER=pxe_ssh"
58 export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_BAREMETAL_BASIC_OPS=True" 58 export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_BAREMETAL_BASIC_OPS=True"
@@ -85,6 +85,6 @@ else
85fi 85fi
86 86
87# Enable magnum plugin in the last step 87# Enable magnum plugin in the last step
88export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin magnum git://git.openstack.org/openstack/magnum stable/ocata" 88export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin magnum https://git.openstack.org/openstack/magnum stable/ocata"
89 89
90$BASE/new/devstack-gate/devstack-vm-gate.sh 90$BASE/new/devstack-gate/devstack-vm-gate.sh
diff --git a/playbooks/magnum-buildimages-base.yaml b/playbooks/magnum-buildimages-base.yaml
index f8aea51..069371a 100644
--- a/playbooks/magnum-buildimages-base.yaml
+++ b/playbooks/magnum-buildimages-base.yaml
@@ -15,7 +15,7 @@
15 fi 15 fi
16 16
17 /usr/zuul-env/bin/zuul-cloner --cache-dir /opt/git \ 17 /usr/zuul-env/bin/zuul-cloner --cache-dir /opt/git \
18 git://git.openstack.org \ 18 https://git.openstack.org \
19 openstack/diskimage-builder \ 19 openstack/diskimage-builder \
20 openstack/dib-utils \ 20 openstack/dib-utils \
21 openstack/magnum $EXTRA_PROJECTS 21 openstack/magnum $EXTRA_PROJECTS
diff --git a/playbooks/magnum-tox-migration.yaml b/playbooks/magnum-tox-migration.yaml
index bd415b7..34ba89b 100644
--- a/playbooks/magnum-tox-migration.yaml
+++ b/playbooks/magnum-tox-migration.yaml
@@ -31,7 +31,7 @@
31 EOF 31 EOF
32 fi 32 fi
33 /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \ 33 /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \
34 git://git.openstack.org $ZUUL_PROJECT openstack/requirements 34 https://git.openstack.org $ZUUL_PROJECT openstack/requirements
35 # REQS_DIR is not set for openstack/requirements and there is also 35 # REQS_DIR is not set for openstack/requirements and there is also
36 # no need to copy in this case. 36 # no need to copy in this case.
37 if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then 37 if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then
diff --git a/playbooks/pre/prepare-workspace.yaml b/playbooks/pre/prepare-workspace.yaml
index 412a04a..c2bb5d0 100644
--- a/playbooks/pre/prepare-workspace.yaml
+++ b/playbooks/pre/prepare-workspace.yaml
@@ -16,7 +16,7 @@
16 dest: devstack-gate 16 dest: devstack-gate
17 EOF 17 EOF
18 /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \ 18 /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
19 git://git.openstack.org \ 19 https://git.openstack.org \
20 openstack-infra/devstack-gate 20 openstack-infra/devstack-gate
21 executable: /bin/bash 21 executable: /bin/bash
22 chdir: '{{ ansible_user_dir }}/workspace' 22 chdir: '{{ ansible_user_dir }}/workspace'