Merge "Add sfc in thirdparty-requirements.txt"

diff --cc docker/Dockerfile
Simple merge

diff --cc docker/Dockerfile.aarch64
Simple merge

diff --cc docker/thirdparty-requirements.txt
index fd262d7,4fe9814..f51a5e2
--- 1/docker/thirdparty-requirements.txt
--- 2/docker/thirdparty-requirements.txt
+++ b/docker/thirdparty-requirements.txt
@@@ -2,7 -2,8 +2,8 @@@ git+https://gerrit.opnfv.org/gerrit/bar
  git+https://gerrit.opnfv.org/gerrit/sdnvpn#egg=sdnvpn
  git+https://gerrit.opnfv.org/gerrit/opera#egg=opera
  git+https://gerrit.opnfv.org/gerrit/securityscanning#egg=securityscanning
+ git+https://gerrit.opnfv.org/gerrit/sfc#egg=sfc
  networking-bgpvpn
  rally
 -tempest>=12.1.0 # Apache-2.0
 +tempest>=15.0.0 # Apache-2.0
  git+https://github.com/openstack/refstack-client#egg=refstack-client

diff --cc functest/ci/config_functest.yaml
index f703d21,ed3f247..1199be5
--- 1/functest/ci/config_functest.yaml
--- 2/functest/ci/config_functest.yaml
+++ b/functest/ci/config_functest.yaml
@@@ -3,10 -3,9 +3,9 @@@ general
          home:               /home/opnfv
          repos:              /home/opnfv/repos
          dir_repo_rally:     /home/opnfv/repos/rally
 -        repo_tempest:       /home/opnfv/repos/tempest
 +        repo_tempest:       /home/opnfv/.tempest
          dir_repo_releng:    /home/opnfv/repos/releng
          repo_vims_test:     /home/opnfv/repos/vnfs/vims-test
-         repo_sfc:           /home/opnfv/repos/sfc
          repo_onos:          /home/opnfv/repos/onos
          repo_netready:      /home/opnfv/repos/netready
          repo_barometer:     /home/opnfv/repos/barometer