--- /dev/null
+[[source]]
+url = "https://pypi.python.org/simple"
+verify_ssl = true
+name = "pypi"
+
+[packages]
+
+[dev-packages]
+
+[requires]
+python_version = "3.8"
 
     git clone --depth 1 https://git.onap.org/testsuite/python-testing-utils -b $ONAP_TAG /src/testing-utils && \
     git clone --depth 1 https://git.onap.org/demo -b $ONAP_TAG /src/demo && \
     pip3 install \
-        -chttps://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG \
+        -chttps://opendev.org/openstack/requirements/raw/branch/$OPENSTACK_TAG/upper-constraints.txt \
         pip==$PIP_TAG && \
     pip3 install \
         -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$OPNFV_TAG \
 
 FROM opnfv/xtesting:jerma
 
-ARG OPENSTACK_TAG=stable/wallaby
+ARG OPENSTACK_TAG=yoga
 ARG PIP_TAG=20.1
 ARG OPNFV_TAG=stable/jerma
 ARG ONAP_TAG=master
     git clone --depth 1 https://git.onap.org/testsuite -b $ONAP_TAG /var/opt/ONAP && \
     git clone --depth 1 https://git.onap.org/demo -b $ONAP_TAG /src/demo && \
     pip install \
-        -chttps://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG \
+        -chttps://releases.openstack.org/constraints/upper/$OPENSTACK_TAG \
         pip==$PIP_TAG && \
     pip install \
         -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$OPNFV_TAG \
 
 usedevelop = True
 deps =
   -chttps://git.opnfv.org/functest/plain/upper-constraints.txt
-  -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=master}
+  -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt}
   -r{toxinidir}/requirements.txt
 install_command = pip install {opts} {packages}
 
 
     pip install --upgrade pip && \
     pip install --no-cache-dir \
     pip install \
-        -chttps://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG \
+        -chttps://opendev.org/openstack/requirements/raw/branch/$OPENSTACK_TAG/upper-constraints.txt \
         pip==$PIP_TAG && \
     pip install \
         -rrequirements.txt && \
 
 
 MAINTAINER Morgan Richomme <morgan.richomme@orange.com>
 
-ARG OPENSTACK_TAG=stable/wallaby
+ARG OPENSTACK_TAG=yoga
 ARG OPNFV_TAG=stable/jerma
 ARG ONAP_TAG=master
 ARG PIP_TAG=20.1
     git clone --depth 1 https://git.onap.org/testsuite -b $ONAP_TAG /var/opt/ONAP && \
     git clone --depth 1 https://git.onap.org/demo -b $ONAP_TAG /src/demo && \
     pip install \
-        -chttps://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG \
+        -chttps://releases.openstack.org/constraints/upper/$OPENSTACK_TAG \
         pip==$PIP_TAG && \
     pip install \
         -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$OPNFV_TAG \