tests: update ceph-ansible for octopus

The octopus tests should use the ceph-ansible stable-5.0 branch and the latest-octopus container image tag. Signed-off-by: Dimitri Savineau <[email protected]>
ceph · Mar 24, 2020 · 91c5fa7 · 91c5fa7
1 parent 5d16ef9
commit 91c5fa7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/tests/tox.sh b/tests/tox.sh
@@ -59,7 +59,7 @@ fi
 
 cd "$WORKSPACE"
 # we test the latest stable release of Ceph in priority
-FLAVOR="master,centos,8"
+FLAVOR="octopus,centos,8"
 
 # build everything that was touched to make sure build succeeds
 mapfile -t FLAVOR_ARRAY < <(sudo make flavors.modified)
@@ -88,11 +88,11 @@ sudo make FLAVORS="$FLAVOR" build.parallel
 # start a local docker registry
 sudo docker run -d -p 5000:5000 --restart=always --name registry registry:2
 # add the image we just built to the registry
-sudo docker tag "${daemon_image}" localhost:5000/ceph/daemon:latest-master
+sudo docker tag "${daemon_image}" localhost:5000/ceph/daemon:latest-octopus
 # this avoids a race condition between the tagging and the push
 # which causes this to sometimes fail when run by jenkins
 sleep 1
-sudo docker --debug push localhost:5000/ceph/daemon:latest-master
+sudo docker --debug push localhost:5000/ceph/daemon:latest-octopus
 
 cd "$CEPH_ANSIBLE_SCENARIO_PATH"
 vagrant up --no-provision --provider="$VAGRANT_PROVIDER"
@@ -104,7 +104,7 @@ export ANSIBLE_SSH_ARGS="-F $CEPH_ANSIBLE_SCENARIO_PATH/vagrant_ssh_config -o Co
 # runs a playbook to configure nodes for testing
 ansible-playbook -vv -i "$CEPH_ANSIBLE_SCENARIO_PATH"/hosts "$TOXINIDIR"/tests/setup.yml --extra-vars="ceph_docker_registry=$REGISTRY_ADDRESS"
 ansible-playbook -vv -i "$CEPH_ANSIBLE_SCENARIO_PATH"/hosts "$TOXINIDIR"/ceph-ansible/tests/functional/lvm_setup.yml
-ansible-playbook -vv -i "$CEPH_ANSIBLE_SCENARIO_PATH"/hosts "$TOXINIDIR"/ceph-ansible/site-docker.yml.sample --extra-vars="ceph_docker_image_tag=latest-master ceph_docker_registry=$REGISTRY_ADDRESS fetch_directory=$CEPH_ANSIBLE_SCENARIO_PATH/fetch"
+ansible-playbook -vv -i "$CEPH_ANSIBLE_SCENARIO_PATH"/hosts "$TOXINIDIR"/ceph-ansible/site-docker.yml.sample --extra-vars="ceph_docker_image_tag=latest-octopus ceph_docker_registry=$REGISTRY_ADDRESS fetch_directory=$CEPH_ANSIBLE_SCENARIO_PATH/fetch"
 
 ansible-playbook -vv -i "$CEPH_ANSIBLE_SCENARIO_PATH"/hosts "$TOXINIDIR"/ceph-ansible/tests/functional/setup.yml
 

diff --git a/tox.ini b/tox.ini
@@ -24,7 +24,7 @@ setenv=
   all_daemons: REGISTRY_ADDRESS = 192.168.17.1:5000
   collocation: REGISTRY_ADDRESS = 192.168.15.1:5000
   lvm_osds: REGISTRY_ADDRESS = 192.168.39.1:5000
-  CEPH_ANSIBLE_BRANCH = master
+  CEPH_ANSIBLE_BRANCH = stable-5.0
   VAGRANT_PROVIDER = {env:VAGRANT_PROVIDER:libvirt}
   CEPH_ANSIBLE_VAGRANT_BOX = centos/8
 deps=