From d1d3aeeca655bd88fc388cbe5ea7a60e8f88e5eb Mon Sep 17 00:00:00 2001 From: Jean-Philippe Evrard Date: Tue, 30 Apr 2019 23:56:57 +0200 Subject: [PATCH] Use opendev links This patch uses the opendev.org links and it also copies over the updated run_tests.sh script. Depends-On: I67ebe9e813c95a3a8bcf204678ddccbcea7a45cd Change-Id: I746b9dbb090dd484a36e826f06beda1eba3f55f4 --- ansible-role-requirements.yml | 102 +++++++++--------- .../repo_packages/openstack_services.yml | 96 ++++++++--------- .../repo_packages/openstack_testing.yml | 2 +- run_tests.sh | 21 ++-- 4 files changed, 112 insertions(+), 109 deletions(-) diff --git a/ansible-role-requirements.yml b/ansible-role-requirements.yml index 90a34c2540..da3acbe969 100644 --- a/ansible-role-requirements.yml +++ b/ansible-role-requirements.yml @@ -1,36 +1,36 @@ - name: ansible-hardening scm: git - src: https://git.openstack.org/openstack/ansible-hardening + src: https://opendev.org/openstack/ansible-hardening version: master trackbranch: master - name: apt_package_pinning scm: git - src: https://git.openstack.org/openstack/openstack-ansible-apt_package_pinning + src: https://opendev.org/openstack/openstack-ansible-apt_package_pinning version: master trackbranch: master - name: config_template scm: git - src: https://git.openstack.org/openstack/ansible-config_template + src: https://opendev.org/openstack/ansible-config_template version: master trackbranch: master - name: galera_client scm: git - src: https://git.openstack.org/openstack/openstack-ansible-galera_client + src: https://opendev.org/openstack/openstack-ansible-galera_client version: master trackbranch: master - name: galera_server scm: git - src: https://git.openstack.org/openstack/openstack-ansible-galera_server + src: https://opendev.org/openstack/openstack-ansible-galera_server version: master trackbranch: master - name: ceph_client scm: git - src: https://git.openstack.org/openstack/openstack-ansible-ceph_client + src: https://opendev.org/openstack/openstack-ansible-ceph_client version: master trackbranch: master - name: haproxy_server scm: git - src: https://git.openstack.org/openstack/openstack-ansible-haproxy_server + src: https://opendev.org/openstack/openstack-ansible-haproxy_server version: master trackbranch: master - name: keepalived @@ -40,192 +40,192 @@ trackbranch: master - name: lxc_container_create scm: git - src: https://git.openstack.org/openstack/openstack-ansible-lxc_container_create + src: https://opendev.org/openstack/openstack-ansible-lxc_container_create version: master trackbranch: master - name: lxc_hosts scm: git - src: https://git.openstack.org/openstack/openstack-ansible-lxc_hosts + src: https://opendev.org/openstack/openstack-ansible-lxc_hosts version: master trackbranch: master - name: memcached_server scm: git - src: https://git.openstack.org/openstack/openstack-ansible-memcached_server + src: https://opendev.org/openstack/openstack-ansible-memcached_server version: master trackbranch: master - name: openstack_hosts scm: git - src: https://git.openstack.org/openstack/openstack-ansible-openstack_hosts + src: https://opendev.org/openstack/openstack-ansible-openstack_hosts version: master trackbranch: master - name: os_keystone scm: git - src: https://git.openstack.org/openstack/openstack-ansible-os_keystone + src: https://opendev.org/openstack/openstack-ansible-os_keystone version: master trackbranch: master - name: openstack_openrc scm: git - src: https://git.openstack.org/openstack/openstack-ansible-openstack_openrc + src: https://opendev.org/openstack/openstack-ansible-openstack_openrc version: master trackbranch: master - name: os_aodh scm: git - src: https://git.openstack.org/openstack/openstack-ansible-os_aodh + src: https://opendev.org/openstack/openstack-ansible-os_aodh version: master trackbranch: master - name: os_barbican scm: git - src: https://git.openstack.org/openstack/openstack-ansible-os_barbican + src: https://opendev.org/openstack/openstack-ansible-os_barbican version: master trackbranch: master - name: os_blazar scm: git - src: https://git.openstack.org/openstack/openstack-ansible-os_blazar + src: https://opendev.org/openstack/openstack-ansible-os_blazar version: master trackbranch: master - name: os_ceilometer scm: git - src: https://git.openstack.org/openstack/openstack-ansible-os_ceilometer + src: https://opendev.org/openstack/openstack-ansible-os_ceilometer version: master trackbranch: master - name: os_cinder scm: git - src: https://git.openstack.org/openstack/openstack-ansible-os_cinder + src: https://opendev.org/openstack/openstack-ansible-os_cinder version: master trackbranch: master - name: os_congress scm: git - src: https://git.openstack.org/openstack/openstack-ansible-os_congress + src: https://opendev.org/openstack/openstack-ansible-os_congress version: master trackbranch: master - name: os_designate scm: git - src: https://git.openstack.org/openstack/openstack-ansible-os_designate + src: https://opendev.org/openstack/openstack-ansible-os_designate version: master trackbranch: master - name: os_glance scm: git - src: https://git.openstack.org/openstack/openstack-ansible-os_glance + src: https://opendev.org/openstack/openstack-ansible-os_glance version: master trackbranch: master - name: os_gnocchi scm: git - src: https://git.openstack.org/openstack/openstack-ansible-os_gnocchi + src: https://opendev.org/openstack/openstack-ansible-os_gnocchi version: master trackbranch: master - name: os_heat scm: git - src: https://git.openstack.org/openstack/openstack-ansible-os_heat + src: https://opendev.org/openstack/openstack-ansible-os_heat version: master trackbranch: master - name: os_horizon scm: git - src: https://git.openstack.org/openstack/openstack-ansible-os_horizon + src: https://opendev.org/openstack/openstack-ansible-os_horizon version: master trackbranch: master - name: os_ironic scm: git - src: https://git.openstack.org/openstack/openstack-ansible-os_ironic + src: https://opendev.org/openstack/openstack-ansible-os_ironic version: master trackbranch: master - name: os_magnum scm: git - src: https://git.openstack.org/openstack/openstack-ansible-os_magnum + src: https://opendev.org/openstack/openstack-ansible-os_magnum version: master trackbranch: master - name: os_manila scm: git - src: https://git.openstack.org/openstack/openstack-ansible-os_manila + src: https://opendev.org/openstack/openstack-ansible-os_manila version: master trackbranch: master - name: os_masakari scm: git - src: https://git.openstack.org/openstack/openstack-ansible-os_masakari + src: https://opendev.org/openstack/openstack-ansible-os_masakari version: master trackbranch: master - name: os_mistral scm: git - src: https://git.openstack.org/openstack/openstack-ansible-os_mistral + src: https://opendev.org/openstack/openstack-ansible-os_mistral version: master trackbranch: master - name: os_neutron scm: git - src: https://git.openstack.org/openstack/openstack-ansible-os_neutron + src: https://opendev.org/openstack/openstack-ansible-os_neutron version: master trackbranch: master - name: os_nova scm: git - src: https://git.openstack.org/openstack/openstack-ansible-os_nova + src: https://opendev.org/openstack/openstack-ansible-os_nova version: master trackbranch: master - name: os_octavia scm: git - src: https://git.openstack.org/openstack/openstack-ansible-os_octavia + src: https://opendev.org/openstack/openstack-ansible-os_octavia version: master trackbranch: master - name: os_panko scm: git - src: https://git.openstack.org/openstack/openstack-ansible-os_panko + src: https://opendev.org/openstack/openstack-ansible-os_panko version: master trackbranch: master - name: os_rally scm: git - src: https://git.openstack.org/openstack/openstack-ansible-os_rally + src: https://opendev.org/openstack/openstack-ansible-os_rally version: master trackbranch: master - name: os_sahara scm: git - src: https://git.openstack.org/openstack/openstack-ansible-os_sahara + src: https://opendev.org/openstack/openstack-ansible-os_sahara version: master trackbranch: master - name: os_swift scm: git - src: https://git.openstack.org/openstack/openstack-ansible-os_swift + src: https://opendev.org/openstack/openstack-ansible-os_swift version: master trackbranch: master - name: os_tacker scm: git - src: https://git.openstack.org/openstack/openstack-ansible-os_tacker + src: https://opendev.org/openstack/openstack-ansible-os_tacker version: master trackbranch: master - name: os_tempest scm: git - src: https://git.openstack.org/openstack/openstack-ansible-os_tempest + src: https://opendev.org/openstack/openstack-ansible-os_tempest version: master trackbranch: master - name: os_trove scm: git - src: https://git.openstack.org/openstack/openstack-ansible-os_trove + src: https://opendev.org/openstack/openstack-ansible-os_trove version: master trackbranch: master - name: plugins scm: git - src: https://git.openstack.org/openstack/openstack-ansible-plugins + src: https://opendev.org/openstack/openstack-ansible-plugins version: master trackbranch: master - name: qdrouterd scm: git - src: https://git.openstack.org/openstack/ansible-role-qdrouterd + src: https://opendev.org/openstack/ansible-role-qdrouterd version: master trackbranch: master - name: rabbitmq_server scm: git - src: https://git.openstack.org/openstack/openstack-ansible-rabbitmq_server + src: https://opendev.org/openstack/openstack-ansible-rabbitmq_server version: master trackbranch: master - name: repo_server scm: git - src: https://git.openstack.org/openstack/openstack-ansible-repo_server + src: https://opendev.org/openstack/openstack-ansible-repo_server version: master trackbranch: master - name: rsyslog_client scm: git - src: https://git.openstack.org/openstack/openstack-ansible-rsyslog_client + src: https://opendev.org/openstack/openstack-ansible-rsyslog_client version: master trackbranch: master - name: rsyslog_server scm: git - src: https://git.openstack.org/openstack/openstack-ansible-rsyslog_server + src: https://opendev.org/openstack/openstack-ansible-rsyslog_server version: master trackbranch: master - name: sshd @@ -269,32 +269,32 @@ version: master trackbranch: master - name: nspawn_container_create - src: https://git.openstack.org/openstack/openstack-ansible-nspawn_container_create + src: https://opendev.org/openstack/openstack-ansible-nspawn_container_create scm: git version: master trackbranch: master - name: nspawn_hosts - src: https://git.openstack.org/openstack/openstack-ansible-nspawn_hosts + src: https://opendev.org/openstack/openstack-ansible-nspawn_hosts scm: git version: master trackbranch: master - name: systemd_service - src: https://git.openstack.org/openstack/ansible-role-systemd_service + src: https://opendev.org/openstack/ansible-role-systemd_service scm: git version: master trackbranch: master - name: systemd_mount - src: https://git.openstack.org/openstack/ansible-role-systemd_mount + src: https://opendev.org/openstack/ansible-role-systemd_mount scm: git version: master trackbranch: master - name: systemd_networkd - src: https://git.openstack.org/openstack/ansible-role-systemd_networkd + src: https://opendev.org/openstack/ansible-role-systemd_networkd scm: git version: master trackbranch: master - name: python_venv_build - src: https://git.openstack.org/openstack/ansible-role-python_venv_build + src: https://opendev.org/openstack/ansible-role-python_venv_build scm: git version: master trackbranch: master diff --git a/playbooks/defaults/repo_packages/openstack_services.yml b/playbooks/defaults/repo_packages/openstack_services.yml index 732360d17e..b7942ddc10 100644 --- a/playbooks/defaults/repo_packages/openstack_services.yml +++ b/playbooks/defaults/repo_packages/openstack_services.yml @@ -30,307 +30,307 @@ ## Global Requirements -requirements_git_repo: https://git.openstack.org/openstack/requirements +requirements_git_repo: https://opendev.org/openstack/requirements requirements_git_install_branch: af41b096a5a0852a15c3989ec48b956433c47873 # HEAD as of 29.03.2019 requirements_git_track_branch: master ## Aodh service -aodh_git_repo: https://git.openstack.org/openstack/aodh +aodh_git_repo: https://opendev.org/openstack/aodh aodh_git_install_branch: 1b552dd82565157c123925adecd12fc279cbbee0 # HEAD as of 29.03.2019 aodh_git_project_group: aodh_all aodh_git_track_branch: master ## Barbican service -barbican_git_repo: https://git.openstack.org/openstack/barbican +barbican_git_repo: https://opendev.org/openstack/barbican barbican_git_install_branch: 4c0ddda941289fba8e5ec4341b5d02d155d46162 # HEAD as of 29.03.2019 barbican_git_project_group: barbican_all barbican_git_track_branch: master ## Ceilometer service -ceilometer_git_repo: https://git.openstack.org/openstack/ceilometer +ceilometer_git_repo: https://opendev.org/openstack/ceilometer ceilometer_git_install_branch: 062e02c612d1fdd8c40b9209319b32e04489c163 # HEAD as of 29.03.2019 ceilometer_git_project_group: all ceilometer_git_track_branch: master ## Cinder service -cinder_git_repo: https://git.openstack.org/openstack/cinder +cinder_git_repo: https://opendev.org/openstack/cinder cinder_git_install_branch: 46363697d9a7ddc7880bf6071e5d035f3f9aa043 # HEAD as of 29.03.2019 cinder_git_project_group: cinder_all cinder_git_track_branch: master ## Designate service -designate_git_repo: https://git.openstack.org/openstack/designate +designate_git_repo: https://opendev.org/openstack/designate designate_git_install_branch: f6cd521eb22d31bd41be58c2ba8a93baf619449f # HEAD as of 29.03.2019 designate_git_project_group: designate_all designate_git_track_branch: master ## Horizon Designate dashboard plugin -designate_dashboard_git_repo: https://git.openstack.org/openstack/designate-dashboard +designate_dashboard_git_repo: https://opendev.org/openstack/designate-dashboard designate_dashboard_git_install_branch: 8f655fec2ddb0a67a853b181beb97bdc3c8c8f6c # HEAD as of 29.03.2019 designate_dashboard_git_project_group: horizon_all designate_dashboard_git_track_branch: master ## Glance service -glance_git_repo: https://git.openstack.org/openstack/glance +glance_git_repo: https://opendev.org/openstack/glance glance_git_install_branch: eb791412b5b7bfc3f6df9cefa2808938d543e908 # HEAD as of 29.03.2019 glance_git_project_group: glance_all glance_git_track_branch: master ## Heat service -heat_git_repo: https://git.openstack.org/openstack/heat +heat_git_repo: https://opendev.org/openstack/heat heat_git_install_branch: 5528c47fad8262adbd11f8590a1550b181c061e0 # HEAD as of 29.03.2019 heat_git_package_name: openstack-heat heat_git_project_group: heat_all heat_git_track_branch: master ## Horizon Heat dashboard plugin -heat_dashboard_git_repo: https://git.openstack.org/openstack/heat-dashboard +heat_dashboard_git_repo: https://opendev.org/openstack/heat-dashboard heat_dashboard_git_install_branch: 25415b0e46190a900cf673114d57226dd0a9637f # HEAD as of 29.03.2019 heat_dashboard_git_project_group: horizon_all heat_dashboard_git_track_branch: master # Not branched yet ## Horizon service -horizon_git_repo: https://git.openstack.org/openstack/horizon +horizon_git_repo: https://opendev.org/openstack/horizon horizon_git_install_branch: 88b27dddedd3123c3f5aa6abfefddd2bd6e3461f # HEAD as of 29.03.2019 horizon_git_project_group: horizon_all horizon_git_track_branch: master ## Horizon Ironic dashboard plugin -ironic_dashboard_git_repo: https://git.openstack.org/openstack/ironic-ui +ironic_dashboard_git_repo: https://opendev.org/openstack/ironic-ui ironic_dashboard_git_install_branch: f725cd6b3ad5ba63bdf71a4bd963f5bc55e96b2e # HEAD as of 29.03.2019 ironic_dashboard_git_project_group: horizon_all ironic_dashboard_git_track_branch: master ## Horizon Magnum dashboard plugin -magnum_dashboard_git_repo: https://git.openstack.org/openstack/magnum-ui +magnum_dashboard_git_repo: https://opendev.org/openstack/magnum-ui magnum_dashboard_git_install_branch: 1ead69705498ad9023f4d0c56d69a1a5910fe91e # HEAD as of 29.03.2019 magnum_dashboard_git_project_group: horizon_all magnum_dashboard_git_track_branch: master ## Horizon Masakari dashboard plugin -masakari_dashboard_git_repo: https://git.openstack.org/openstack/masakari-dashboard +masakari_dashboard_git_repo: https://opendev.org/openstack/masakari-dashboard masakari_dashboard_git_install_branch: e05a1822db99178f79108b26625029cce477b441 # HEAD as of 29.03.2019 masakari_dashboard_git_project_group: horizon_all masakari_dashboard_git_track_branch: master # Not branched yet ## Horizon LBaaS dashboard plugin -neutron_lbaas_dashboard_git_repo: https://git.openstack.org/openstack/neutron-lbaas-dashboard +neutron_lbaas_dashboard_git_repo: https://opendev.org/openstack/neutron-lbaas-dashboard neutron_lbaas_dashboard_git_install_branch: ae51e99b03306f256e330e9480b72ae6e7f91535 # HEAD as of 29.03.2019 neutron_lbaas_dashboard_git_project_group: horizon_all neutron_lbaas_dashboard_git_track_branch: master ## Horizon FWaaS dashboard plugin -neutron_fwaas_dashboard_git_repo: https://git.openstack.org//openstack/neutron-fwaas-dashboard +neutron_fwaas_dashboard_git_repo: https://opendev.org//openstack/neutron-fwaas-dashboard neutron_fwaas_dashboard_git_install_branch: 87b27591dc79552166f2410ae0efda36f1ff2b8d # HEAD as of 29.03.2019 neutron_fwaas_dashboard_git_project_group: horizon_all neutron_fwaas_dashboard_git_track_branch: master ## Horizon Sahara dashboard plugin -sahara_dashboard_git_repo: https://git.openstack.org/openstack/sahara-dashboard +sahara_dashboard_git_repo: https://opendev.org/openstack/sahara-dashboard sahara_dashboard_git_install_branch: 775c953716eaa7a1b48ce69f111113e103a27ecf # HEAD as of 29.03.2019 sahara_dashboard_git_project_group: horizon_all sahara_dashboard_git_track_branch: master ## Keystone service -keystone_git_repo: https://git.openstack.org/openstack/keystone +keystone_git_repo: https://opendev.org/openstack/keystone keystone_git_install_branch: eaa3e4e3bc15c7e342aa0574768d65aa5f5cb81c # HEAD as of 29.03.2019 keystone_git_project_group: keystone_all keystone_git_track_branch: master ## Manila service -manila_git_repo: https://git.openstack.org/openstack/manila +manila_git_repo: https://opendev.org/openstack/manila manila_git_install_branch: 54bce0a9ca07952cd97cd2bc8641f81ab2c49af5 # HEAD as of 22.03.2019 manila_git_project_group: manila_all manila_git_track_branch: master ## Neutron service -neutron_git_repo: https://git.openstack.org/openstack/neutron +neutron_git_repo: https://opendev.org/openstack/neutron neutron_git_install_branch: 4da4d5e0f0c2eb49b8929119776d16504229a4c3 # HEAD as of 29.03.2019 neutron_git_project_group: neutron_all neutron_git_track_branch: master -neutron_lbaas_git_repo: https://git.openstack.org/openstack/neutron-lbaas +neutron_lbaas_git_repo: https://opendev.org/openstack/neutron-lbaas neutron_lbaas_git_install_branch: e21efe39f2bab37838ad0c00d637ab88b609e822 # HEAD as of 29.03.2019 neutron_lbaas_git_project_group: neutron_all neutron_lbaas_git_track_branch: master -neutron_vpnaas_git_repo: https://git.openstack.org/openstack/neutron-vpnaas +neutron_vpnaas_git_repo: https://opendev.org/openstack/neutron-vpnaas neutron_vpnaas_git_install_branch: acf8d1948570a2092629b5ee97d418e9153b3877 # HEAD as of 29.03.2019 neutron_vpnaas_git_project_group: neutron_all neutron_vpnaas_git_track_branch: master -neutron_fwaas_git_repo: https://git.openstack.org/openstack/neutron-fwaas +neutron_fwaas_git_repo: https://opendev.org/openstack/neutron-fwaas neutron_fwaas_git_install_branch: 4a8687e3f36061735064a89a2f9401bfa94e992e # HEAD as of 29.03.2019 neutron_fwaas_git_project_group: neutron_all neutron_fwaas_git_track_branch: master -neutron_dynamic_routing_git_repo: https://git.openstack.org/openstack/neutron-dynamic-routing +neutron_dynamic_routing_git_repo: https://opendev.org/openstack/neutron-dynamic-routing neutron_dynamic_routing_git_install_branch: c27bb1f190a60d201d616bebd42c60dae6afa545 # HEAD as of 29.03.2019 neutron_dynamic_routing_git_project_group: neutron_all neutron_dynamic_routing_git_track_branch: master # Networking calico follows master -networking_calico_git_repo: https://git.openstack.org/openstack/networking-calico +networking_calico_git_repo: https://opendev.org/openstack/networking-calico networking_calico_git_install_branch: 0699d971413eee13c42a12e2ed5d35598f58f827 # HEAD as of 29.03.2019 networking_calico_git_project_group: neutron_all networking_calico_git_track_branch: master -networking_odl_git_repo: https://git.openstack.org/openstack/networking-odl +networking_odl_git_repo: https://opendev.org/openstack/networking-odl networking_odl_git_install_branch: d4373026e9be1bccd70369b806d9ccba8a500eaf # HEAD as of 29.03.2019 networking_odl_git_project_group: neutron_all networking_odl_git_track_branch: master -networking_ovn_git_repo: https://git.openstack.org/openstack/networking-ovn +networking_ovn_git_repo: https://opendev.org/openstack/networking-ovn networking_ovn_git_install_branch: 71450fc93d666b0a8ddc0c141bfd803730b44815 # HEAD as of 29.03.2019 networking_ovn_git_project_group: neutron_all networking_ovn_git_track_branch: master # BGPVPN is frozen until further notice due to # https://github.com/openstack/networking-bgpvpn/commit/e9a0ea199b47f76f69545e04bdb4db44869c388b#diff-b4ef698db8ca845e5845c4618278f29a -networking_bgpvpn_git_repo: https://git.openstack.org/openstack/networking-bgpvpn +networking_bgpvpn_git_repo: https://opendev.org/openstack/networking-bgpvpn networking_bgpvpn_git_install_branch: 3b93ddacd390d92fb144e5660324d4da064ad9a4 # FROZEN HEAD of "master" as of 31.03.2018 networking_bgpvpn_git_project_group: neutron_all networking_bgpvpn_git_track_branch: None -networking_sfc_git_repo: https://git.openstack.org/openstack/networking-sfc +networking_sfc_git_repo: https://opendev.org/openstack/networking-sfc networking_sfc_git_install_branch: 5ea96a1c85710fb24f860267042fd52e64b59c87 # HEAD as of 29.03.2019 networking_sfc_git_project_group: neutron_all networking_sfc_git_track_branch: master ## Nova service -nova_git_repo: https://git.openstack.org/openstack/nova +nova_git_repo: https://opendev.org/openstack/nova nova_git_install_branch: e4857b98573bb5b50797298886399c5c37ab3eba # HEAD as of 29.03.2019 nova_git_project_group: nova_all nova_git_track_branch: master ## PowerVM Virt Driver -nova_powervm_git_repo: https://git.openstack.org/openstack/nova-powervm +nova_powervm_git_repo: https://opendev.org/openstack/nova-powervm nova_powervm_git_install_branch: 5104bc6e4c68523f0cf52bbd304cc54c4eff0938 # HEAD as of 29.03.2019 nova_powervm_git_project_group: nova_all nova_powervm_git_track_branch: master ## LXD Virt Driver -nova_lxd_git_repo: https://git.openstack.org/openstack/nova-lxd +nova_lxd_git_repo: https://opendev.org/openstack/nova-lxd nova_lxd_git_install_branch: 3c01bfcb7e38b5fe3f274c97a4c5d4b7e9d4299c # HEAD as of 29.03.2019 nova_lxd_git_project_group: nova_all nova_lxd_git_track_branch: master # Not branched yet ## Sahara service -sahara_git_repo: https://git.openstack.org/openstack/sahara +sahara_git_repo: https://opendev.org/openstack/sahara sahara_git_install_branch: aa8596d03eb2f955636aea9fa848a5a1723755ff # HEAD as of 29.03.2019 sahara_git_project_group: sahara_all sahara_git_track_branch: master ## Swift service -swift_git_repo: https://git.openstack.org/openstack/swift +swift_git_repo: https://opendev.org/openstack/swift swift_git_install_branch: 7702df8caf441503acff9c052f3e34eeb6462bb0 # HEAD as of 29.03.2019 swift_git_project_group: swift_all swift_git_track_branch: master ## Ironic service -ironic_git_repo: https://git.openstack.org/openstack/ironic +ironic_git_repo: https://opendev.org/openstack/ironic ironic_git_install_branch: 5c1f2d102942e9f4d946cfaaf747e4d551b237a8 # HEAD as of 29.03.2019 ironic_git_project_group: ironic_all ironic_git_track_branch: master ## Magnum service -magnum_git_repo: https://git.openstack.org/openstack/magnum +magnum_git_repo: https://opendev.org/openstack/magnum magnum_git_install_branch: 18ce317d025842643aa5e786b99154b1fc16641f # HEAD as of 29.03.2019 magnum_git_project_group: magnum_all magnum_git_track_branch: master ## Masakari service -masakari_git_repo: https://git.openstack.org/openstack/masakari +masakari_git_repo: https://opendev.org/openstack/masakari masakari_git_install_branch: 150a835d95e599471e965ad75bb8ec817d93b46d # HEAD as of 29.03.2019 masakari_git_project_group: masakari_api masakari_git_track_branch: master ## Masakari monitors services -masakari_monitors_git_repo: https://git.openstack.org/openstack/masakari-monitors +masakari_monitors_git_repo: https://opendev.org/openstack/masakari-monitors masakari_monitors_git_install_branch: 5b338058abfdc5066eba375e182932f5e0f7436f # HEAD as of 29.03.2019 masakari_monitors_git_project_group: masakari_monitor masakari_monitors_git_track_branch: master ## Mistral service -mistral_git_repo: https://git.openstack.org/openstack/mistral +mistral_git_repo: https://opendev.org/openstack/mistral mistral_git_install_branch: 5b7151b946bdf571ca25816fe36a680dc446b5e4 # HEAD as of 29.03.2019 mistral_git_project_group: mistral_all mistral_git_track_branch: master ## Trove service -trove_git_repo: https://git.openstack.org/openstack/trove +trove_git_repo: https://opendev.org/openstack/trove trove_git_install_branch: 75784f94b1411a325ab3bdff4c71d2e5aa2abc2b # HEAD as of 29.03.2019 trove_git_project_group: trove_all trove_git_track_branch: master ## Horizon Trove dashboard plugin -trove_dashboard_git_repo: https://git.openstack.org/openstack/trove-dashboard +trove_dashboard_git_repo: https://opendev.org/openstack/trove-dashboard trove_dashboard_git_install_branch: cc11fc13ee1d1a1688031de9145025afe06ccbce # HEAD as of 29.03.2019 trove_dashboard_git_project_group: horizon_all trove_dashboard_git_track_branch: master ## Octavia service -octavia_git_repo: https://git.openstack.org/openstack/octavia +octavia_git_repo: https://opendev.org/openstack/octavia octavia_git_install_branch: 80bfa259f4a6a71ecd077b452993e83dc9ab501a # HEAD as of 29.03.2019 octavia_git_project_group: octavia_all octavia_git_track_branch: master ## Panko service -panko_git_repo: https://git.openstack.org/openstack/panko +panko_git_repo: https://opendev.org/openstack/panko panko_git_install_branch: 91f809625560d770f39299f782eff2b56ec84874 # HEAD as of 23.03.2019 panko_git_project_group: panko_all panko_git_track_branch: master ## Tacker service -tacker_git_repo: https://git.openstack.org/openstack/tacker +tacker_git_repo: https://opendev.org/openstack/tacker tacker_git_install_branch: dc4343bda48cb52b63840cd16470ba3ff9460151 # HEAD as of 29.03.2019 tacker_git_project_group: tacker_all tacker_git_track_branch: master ## Congress service -congress_git_repo: https://git.openstack.org/openstack/congress +congress_git_repo: https://opendev.org/openstack/congress congress_git_install_branch: 030eed8c5519d44a69b3b458cf5169086852ae0d # HEAD as of 29.03.2019 congress_git_package_name: openstack-congress congress_git_project_group: congress_all congress_git_track_branch: master ## Horizon Octavia dashboard plugin -octavia_dashboard_git_repo: https://git.openstack.org/openstack/octavia-dashboard +octavia_dashboard_git_repo: https://opendev.org/openstack/octavia-dashboard octavia_dashboard_git_install_branch: 73fae9959293c92919bacca89af32ccf0df32c51 # HEAD as of 29.03.2019 octavia_dashboard_git_project_group: horizon_all octavia_dashboard_git_track_branch: master ## Blazar service -blazar_git_repo: https://git.openstack.org/openstack/blazar +blazar_git_repo: https://opendev.org/openstack/blazar blazar_git_install_branch: 6e6ffeb52906ec25ce60799bd513d486003a6802 # HEAD as of 29.03.2019 blazar_git_project_group: blazar_all blazar_git_track_branch: master ## Blazar Nova Service -blazar_nova_git_repo: https://git.openstack.org/openstack/blazar-nova +blazar_nova_git_repo: https://opendev.org/openstack/blazar-nova blazar_nova_git_install_branch: 5a220faf92ea2c1ff5b5b334435b2b80d4d34490 # HEAD as of 29.03.2019 blazar_nova_git_project_group: blazar_all blazar_nova_git_track_branch: master diff --git a/playbooks/defaults/repo_packages/openstack_testing.yml b/playbooks/defaults/repo_packages/openstack_testing.yml index 58074f4a93..6263cd2a82 100644 --- a/playbooks/defaults/repo_packages/openstack_testing.yml +++ b/playbooks/defaults/repo_packages/openstack_testing.yml @@ -16,7 +16,7 @@ # TODO(evrardjp): Remove this file from stable branches to allow the latest tempest # release to be used instead, when a PyPI published version of tempest contains # https://github.com/openstack/tempest/commit/7d2b636a30057ed8db8cfd4fe2248f509b3570f1#diff-5c9acbc10dc9d27b47985cd74ab100f6 -tempest_git_repo: https://git.openstack.org/openstack/tempest +tempest_git_repo: https://opendev.org/openstack/tempest tempest_git_install_branch: db2fbc9268c6206783823b193d4bab01e00abafb # HEAD as of 29.03.2019 tempest_git_project_group: utility_all tempest_git_track_branch: master diff --git a/run_tests.sh b/run_tests.sh index a31f946423..0d2891de24 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -33,10 +33,11 @@ set -xeu ## Vars ---------------------------------------------------------------------- WORKING_DIR="$(readlink -f $(dirname $0))" +OSA_PROJECT_NAME="$(sed -n 's|^project=openstack/\(.*\).git$|\1|p' $(pwd)/.gitreview)" COMMON_TESTS_PATH="${WORKING_DIR}/tests/common" TESTING_HOME=${TESTING_HOME:-$HOME} -ZUUL_TESTS_CLONE_LOCATION="/home/zuul/src/git.openstack.org/openstack/openstack-ansible-tests" +ZUUL_TESTS_CLONE_LOCATION="/home/zuul/src/opendev.org/openstack/openstack-ansible-tests" # Use .gitreview as the key to determine the appropriate # branch to clone for tests. @@ -58,32 +59,34 @@ case ${ID,,} in *suse*) pkg_mgr_cmd="zypper -n in" ;; centos|rhel|fedora) pkg_mgr_cmd="${RHT_PKG_MGR} install -y" ;; ubuntu|debian) pkg_mgr_cmd="apt-get install -y" ;; + # Gentoo needs to have version set since it's rolling + gentoo) pkg_mgr_cmd="emerge --jobs=4"; VERSION="rolling" ;; *) echo "unsupported distribution: ${ID,,}"; exit 1 ;; esac -# Install git so that we can clone the tests repo -eval sudo $pkg_mgr_cmd git +# Install git so that we can clone the tests repo if git is not available +which git &>/dev/null || eval sudo "${pkg_mgr_cmd}" git # Clone the tests repo for access to the common test script -if [[ ! -d ${COMMON_TESTS_PATH} ]]; then +if [[ ! -d "${COMMON_TESTS_PATH}" ]]; then # The tests repo doesn't need a clone, we can just # symlink it. - if [[ "$(basename ${WORKING_DIR})" == "openstack-ansible-tests" ]]; then - ln -s ${WORKING_DIR} ${COMMON_TESTS_PATH} + if [[ "${OSA_PROJECT_NAME}" == "openstack-ansible-tests" ]]; then + ln -s "${WORKING_DIR}" "${COMMON_TESTS_PATH}" # In zuul v3 any dependent repository is placed into # /home/zuul/src/git.openstack.org, so we check to see # if there is a tests checkout there already. If so, we # symlink that and use it. elif [[ -d "${ZUUL_TESTS_CLONE_LOCATION}" ]]; then - ln -s "${ZUUL_TESTS_CLONE_LOCATION}" ${COMMON_TESTS_PATH} + ln -s "${ZUUL_TESTS_CLONE_LOCATION}" "${COMMON_TESTS_PATH}" # Otherwise we're clearly not in zuul or using a previously setup # repo in some way, so just clone it from upstream. else - git clone -b ${TESTING_BRANCH} \ + git clone -b "${TESTING_BRANCH}" \ https://git.openstack.org/openstack/openstack-ansible-tests \ - ${COMMON_TESTS_PATH} + "${COMMON_TESTS_PATH}" fi fi