Skip to content

Commit 763affc

Browse files
committed
tests: do not use dev repo (rbdmirror)
use stable repositories for rbdmirror scenarios Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
1 parent 6f1554c commit 763affc

File tree

1 file changed

+0
-5
lines changed

1 file changed

+0
-5
lines changed

tox-rbdmirror.ini

-5
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,6 @@ commands=
5353
ceph_rbd_mirror_local_user_secret=AQC+eM1iKKBXFBAAVpunJvqpkodHSYmljCFCnw== \
5454
yes_i_know=true \
5555
ireallymeanit=yes \
56-
ceph_dev_branch={env:CEPH_DEV_BRANCH:main} \
57-
ceph_dev_sha1={env:CEPH_DEV_SHA1:latest} \
5856
ceph_docker_registry_auth=True \
5957
ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \
6058
ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \
@@ -63,7 +61,6 @@ commands=
6361
bash -c "cd {changedir}/secondary && bash {toxinidir}/tests/scripts/vagrant_up.sh --no-provision {posargs:--provider=virtualbox}"
6462
bash -c "cd {changedir}/secondary && bash {toxinidir}/tests/scripts/generate_ssh_config.sh {changedir}/secondary"
6563
ansible-playbook --ssh-common-args='-F {changedir}/secondary/vagrant_ssh_config -o ControlMaster=auto -o ControlPersist=600s -o PreferredAuthentications=publickey' -vv -i {changedir}/secondary/hosts {toxinidir}/tests/functional/setup.yml
66-
ansible-playbook -vv -i "localhost," -c local {toxinidir}/tests/functional/dev_setup.yml --extra-vars "dev_setup={env:DEV_SETUP:False} change_dir={changedir}/secondary ceph_dev_branch={env:CEPH_DEV_BRANCH:main} ceph_dev_sha1={env:CEPH_DEV_SHA1:latest}" --tags "vagrant_setup"
6764
ansible-playbook --ssh-common-args='-F {changedir}/secondary/vagrant_ssh_config -o ControlMaster=auto -o ControlPersist=600s -o PreferredAuthentications=publickey' -vv -i {changedir}/secondary/hosts {toxinidir}/tests/functional/lvm_setup.yml
6865
# ensure the rule isn't already present
6966
ansible -i localhost, all -c local -b -m iptables -a 'chain=FORWARD protocol=tcp source=192.168.0.0/16 destination=192.168.0.0/16 jump=ACCEPT action=insert rule_num=1 state=absent'
@@ -77,8 +74,6 @@ commands=
7774
ceph_rbd_mirror_remote_key=AQC+eM1iKKBXFBAAVpunJvqpkodHSYmljCFCnw== \
7875
ceph_rbd_mirror_remote_cluster=remote \
7976
ireallymeanit=yes \
80-
ceph_dev_branch={env:CEPH_DEV_BRANCH:main} \
81-
ceph_dev_sha1={env:CEPH_DEV_SHA1:latest} \
8277
ceph_docker_registry_auth=True \
8378
ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \
8479
ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \

0 commit comments

Comments
 (0)