[XTESTING] Fix constraint issue in smoke-usecase images

Since last build there were changes in availability
of both packages and constraits files. This commit
fixes that by copying constraints locally and altering
required packages versions to avoid conflicts.

Issue-ID: INT-2288
Change-Id: Iba2e3eeb15c98522b1ac3018142f544dcb9aa61c
Signed-off-by: Marek Szwałkiewicz <marek.szwalkiewicz@external.t-mobile.pl>

7 files changed, 448 insertions, 57 deletions

diff --git a/healthcheck/docker/Dockerfile b/healthcheck/docker/Dockerfile
index eb3086c..5e0a5e1 100644
--- a/healthcheck/docker/Dockerfile
+++ b/healthcheck/docker/Dockerfile
@@ -25,10 +25,6 @@ RUN apk --no-cache add --update openssl chromium chromium-chromedriver && \
     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://releases.openstack.org/constraints/upper/$OPENSTACK_TAG \
-        pip==$PIP_TAG && \
-    pip install \
-        -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$OPNFV_TAG \
         -cupper-constraints.txt \
         -rrequirements.txt && \
     mkdir -p /var/opt/ONAP/demo/heat && cp -Rf /src/demo/heat/vFW /var/opt/ONAP/demo/heat/ && \
diff --git a/healthcheck/requirements.txt b/healthcheck/requirements.txt
index a2744bb..ac72661 100644
--- a/healthcheck/requirements.txt
+++ b/healthcheck/requirements.txt
@@ -1,14 +1,14 @@
 selenium==4.8.3
-robotframework-seleniumlibrary==6.0.0
-robotframework-archivelibrary==0.4.2
-robotframework-sshlibrary==3.3.0
-robotframework-httplibrary==0.4.2
-robotframework-ftplibrary==1.9
+robotframework-seleniumlibrary
+robotframework-archivelibrary
+robotframework-sshlibrary
+robotframework-httplibrary
+robotframework-ftplibrary
 requests==2.29.0
 robotframework-selenium2library==3.0.0
-robotframework-databaselibrary==1.2.4
-robotframework-extendedselenium2library==0.9.2
-robotframework-requests==0.5.0
+robotframework-databaselibrary
+robotframework-extendedselenium2library
+robotframework-requests
 deepdiff==6.3.0
 dnspython==2.3.0
 pyyaml>=4.2b1
diff --git a/healthcheck/upper-constraints.txt b/healthcheck/upper-constraints.txt
index f72abaa..52fd08d 100644
--- a/healthcheck/upper-constraints.txt
+++ b/healthcheck/upper-constraints.txt
@@ -1 +1,13 @@
-importlib_metadata==4.12.0
\ No newline at end of file
+importlib_metadata==4.12.0
+robotframework-httplibrary===0.4.2
+ansible===2.9.2
+xtesting===0.91.0
+bandit===1.1.0
+ruamel.yaml.jinja2==0.2.2
+ujson===2.0.3
+pylint===2.3.1
+ruamel.yaml===0.15.100
+sphinxcontrib-spelling===4.3.0
+kubernetes===11.0.0
+ansible-lint===4.2.0
+setuptools_scm===6.0.1
\ No newline at end of file
diff --git a/smoke-usecases-robot-py3/docker/Dockerfile b/smoke-usecases-robot-py3/docker/Dockerfile
index f5c7bb6..f25df54 100644
--- a/smoke-usecases-robot-py3/docker/Dockerfile
+++ b/smoke-usecases-robot-py3/docker/Dockerfile
@@ -1,6 +1,6 @@
 FROM opnfv/xtesting:wallaby
 
-MAINTAINER Morgan Richomme <morgan.richomme@orange.com>
+LABEL org.opencontainers.image.authors="Morgan Richomme <morgan.richomme@orange.com>"
 
 ARG OPENSTACK_TAG=master
 ARG OPNFV_TAG=master
@@ -19,19 +19,15 @@ COPY requirements.txt requirements.txt
 RUN apk --no-cache add --update openssl && \
     apk --no-cache add --virtual .build-deps --update \
         python3-dev build-base linux-headers libffi-dev \
-        openssl-dev libjpeg-turbo-dev && \
-    git clone --depth 1 https://github.com/onap/cps.git -b $ONAP_TAG /cps  && \
-    find /cps -mindepth 1 -name csit -prune -o -exec rm -rf {} + && \
-    git clone --depth 1 https://github.com/onap/cps-cps-temporal.git -b $ONAP_TAG /cps-cps-temporal  && \
-    find /cps-cps-temporal -mindepth 1 -name csit -prune -o -exec rm -rf {} + && \
-    git clone --depth 1 https://github.com/onap/cps-ncmp-dmi-plugin.git -b $ONAP_TAG /cps-ncmp-dmi-plugin  && \
-    find /cps-ncmp-dmi-plugin -mindepth 1 -name csit -prune -o -exec rm -rf {} + && \
-    pip install --upgrade pip && \
-    pip install --no-cache-dir \
-    pip install \
-        -chttps://opendev.org/openstack/requirements/raw/branch/$OPENSTACK_TAG/upper-constraints.txt \
-        pip==$PIP_TAG && \
-    pip install \
+        openssl-dev libjpeg-turbo-dev
+RUN git clone --depth 1 https://github.com/onap/cps.git -b $ONAP_TAG /cps  && \
+    find /cps -mindepth 1 -name csit -prune -o -exec rm -rf {} + 
+RUN git clone --depth 1 https://github.com/onap/cps-cps-temporal.git -b $ONAP_TAG /cps-cps-temporal  && \
+    find /cps-cps-temporal -mindepth 1 -name csit -prune -o -exec rm -rf {} + 
+RUN git clone --depth 1 https://github.com/onap/cps-ncmp-dmi-plugin.git -b $ONAP_TAG /cps-ncmp-dmi-plugin  && \
+    find /cps-ncmp-dmi-plugin -mindepth 1 -name csit -prune -o -exec rm -rf {} + 
+RUN pip install --upgrade pip
+RUN pip install \
         -rrequirements.txt && \
     rm -r requirements.txt && \
     cd / && ln -s /var/opt/ONAP/robot/ /robot && \
diff --git a/smoke-usecases-robot/docker/Dockerfile b/smoke-usecases-robot/docker/Dockerfile
index 395e5a7..d53371c 100644
--- a/smoke-usecases-robot/docker/Dockerfile
+++ b/smoke-usecases-robot/docker/Dockerfile
@@ -21,27 +21,22 @@ ADD https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 get_helm
 
 COPY requirements.txt requirements.txt
 COPY upper-constraints.txt upper-constraints.txt
+RUN git clone --depth 1 https://git.onap.org/testsuite -b $ONAP_TAG /var/opt/ONAP
+RUN git clone --depth 1 https://git.onap.org/demo -b $ONAP_TAG /src/demo
 RUN apk --no-cache add --update openssl chromium chromium-chromedriver && \
     apk --no-cache add --virtual .build-deps --update \
         python3-dev build-base linux-headers libffi-dev \
         openssl-dev libjpeg-turbo-dev curl && \
     curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y && \
     . "$HOME/.cargo/env" && \
-    chmod +x /usr/local/bin/kubectl && \
-    pip3 install --upgrade pip && \
-    pip3 install --no-cache-dir \
-    git+https://git.onap.org/testsuite/heatbridge.git@$ONAP_TAG#egg=heatbridge\&subdirectory=heatbridge  \
-    git+https://git.onap.org/testsuite/python-testing-utils.git@$ONAP_TAG#egg=robotframework-onap\&subdirectory=robotframework-onap && \
-    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://releases.openstack.org/constraints/upper/$OPENSTACK_TAG \
-        pip==$PIP_TAG && \
-    pip install \
-        -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$OPNFV_TAG \
+    chmod +x /usr/local/bin/kubectl
+RUN pip3 install -U pip wheel
+RUN pip3 install --no-cache-dir \
         -cupper-constraints.txt \
-        -rrequirements.txt && \
-    mkdir -p /var/opt/ONAP/demo/heat && cp -Rf /src/demo/heat/vFW /var/opt/ONAP/demo/heat/ && \
+        git+https://git.onap.org/testsuite/heatbridge.git@$ONAP_TAG#egg=heatbridge\&subdirectory=heatbridge  \
+        git+https://git.onap.org/testsuite/python-testing-utils.git@$ONAP_TAG#egg=robotframework-onap\&subdirectory=robotframework-onap \
+        -rrequirements.txt
+RUN mkdir -p /var/opt/ONAP/demo/heat && cp -Rf /src/demo/heat/vFW /var/opt/ONAP/demo/heat/ && \
     mkdir -p /var/opt/ONAP/demo/tosca && cp -Rf /src/demo/tosca/pNF /var/opt/ONAP/demo/tosca/ && \
     mkdir -p /demo/service_mapping && cp -Rf /src/demo/service_mapping /demo/ && \
     mkdir -p /var/opt/ONAP/demo/preload_data && cp -Rf /src/demo/preload_data /var/opt/ONAP/demo/ && \
diff --git a/smoke-usecases-robot/requirements.txt b/smoke-usecases-robot/requirements.txt
index e81536b..34b2c20 100644
--- a/smoke-usecases-robot/requirements.txt
+++ b/smoke-usecases-robot/requirements.txt
@@ -1,16 +1,16 @@
-selenium==4.8.3
-robotframework-seleniumlibrary==6.0.0
-robotframework-archivelibrary==0.4.2
-robotframework-sshlibrary==3.3.0
-robotframework-httplibrary==0.4.2
-robotframework-ftplibrary==1.9
-requests==2.29.0
+selenium>=4.8.3
+robotframework-seleniumlibrary
+robotframework-archivelibrary
+robotframework-sshlibrary
+robotframework-httplibrary
+robotframework-ftplibrary
+requests>=2.29.0
 robotframework-selenium2library==3.0.0
-robotframework-databaselibrary==1.2.4
-robotframework-extendedselenium2library==0.9.2
-robotframework-requests==0.5.0
-robotframework-jsonlibrary==0.5
-deepdiff==6.3.0
-dnspython==2.3.0
-pyyaml>=4.2b1
-json5==0.9.11
+robotframework-databaselibrary
+robotframework-extendedselenium2library
+robotframework-requests
+robotframework-jsonlibrary
+deepdiff
+dnspython
+pyyaml
+json5
diff --git a/smoke-usecases-robot/upper-constraints.txt b/smoke-usecases-robot/upper-constraints.txt
index f72abaa..8897535 100644
--- a/smoke-usecases-robot/upper-constraints.txt
+++ b/smoke-usecases-robot/upper-constraints.txt
@@ -1 +1,393 @@
-importlib_metadata==4.12.0
\ No newline at end of file
+importlib_metadata==4.12.0
+APScheduler===3.2.0
+Babel===2.3.4
+CouchDB===1.1
+Django===1.8.14
+Flask===0.11.1
+GitPython===2.0.8
+Jinja2===2.8
+Mako===1.0.4
+MarkupSafe===0.23
+MySQL-python===1.2.5
+Parsley===1.3
+Paste===2.0.3
+PasteDeploy===1.5.2
+Pillow===3.3.1
+Pint===0.7.2
+PuLP===1.6.1
+PyECLib===1.2.0
+PyJWT===1.4.2
+PyKMIP===0.5.0
+PyMySQL===0.7.6
+PyYAML===3.12
+Pygments===2.1.3
+Routes===2.3.1
+SQLAlchemy===1.0.14
+SQLAlchemy-Utils===0.32.9
+SecretStorage===2.3.1
+Sphinx===1.2.3
+Tempita===0.5.2
+WSME===0.8.0
+WebOb===1.6.1
+WebTest===2.0.23
+Werkzeug===0.11.11
+XStatic===1.0.1
+XStatic-Angular===1.4.10.1
+XStatic-Angular-Bootstrap===0.11.0.8
+XStatic-Angular-FileUpload===12.0.4.0
+XStatic-Angular-Gettext===2.1.0.2
+XStatic-Angular-Schema-Form===0.8.13.0
+XStatic-Angular-lrdragndrop===1.0.2.2
+XStatic-Bootstrap-Datepicker===1.3.1.0
+XStatic-Bootstrap-SCSS===3.3.7.1
+XStatic-D3===3.1.6.2
+XStatic-Font-Awesome===4.5.0.0
+XStatic-Hogan===2.0.0.2
+XStatic-JQuery-Migrate===1.2.1.1
+XStatic-JQuery.TableSorter===2.14.5.1
+XStatic-JQuery.quicksearch===2.0.3.1
+XStatic-JSEncrypt===2.0.0.2
+XStatic-Jasmine===2.4.1.1
+XStatic-Magic-Search===0.2.5.1
+XStatic-Rickshaw===1.5.0.0
+XStatic-Spin===1.2.5.2
+XStatic-bootswatch===3.3.6.0
+XStatic-jQuery===1.10.2.1
+XStatic-jquery-ui===1.11.0.1
+XStatic-mdi===1.4.57.0
+XStatic-objectpath===1.2.1.0
+XStatic-roboto-fontface===0.4.3.2
+XStatic-smart-table===1.4.13.2
+XStatic-term.js===0.0.7.0
+XStatic-tv4===1.2.7.0
+XenAPI===1.2
+alembic===0.8.7
+amqp===1.4.9
+anyjson===0.3.3
+aodhclient===0.7.0
+appdirs===1.4.3
+astroid===1.3.8
+autobahn===0.16.0
+automaton===1.4.0
+backports.ssl-match-hostname===3.5.0.1
+bandit===1.1.0
+bashate===0.5.1
+beautifulsoup4===4.5.1
+betamax===0.8.0
+blockdiag===1.5.3
+boto===2.42.0
+botocore===1.4.50
+cachetools===1.1.6
+cassandra-driver===3.5.0
+castellan===0.4.0
+ceilometermiddleware===0.5.2
+chardet===2.3.0
+click===6.6
+cliff===2.2.0
+cliff-tablib===2.0
+cmd2===0.6.8
+colorama===0.3.7
+configparser===3.5.0
+contextlib2===0.5.4
+coverage===4.2
+crc16===0.1.1
+croniter===0.3.12
+cryptography===38.0.4
+cursive===0.1.1
+ddt===1.1.0
+debtcollector===1.8.0
+decorator===4.0.10
+demjson===2.2.4
+dib-utils===0.0.10
+discover===0.4.0
+diskimage-builder===1.19.0
+django-appconf===1.0.2
+django-babel===0.5.1
+django-compressor===2.1
+django-floppyforms===1.7.0
+django-formtools===1.0
+django-nose===1.4.4
+django-openstack-auth===2.4.2
+django-pyscss===2.0.2
+dnspython===1.14.0
+dnspython3===1.12.0
+dnspython3===1.12.0
+doc8===0.7.0
+docker-py===1.7.2
+docutils===0.12
+dogpile.cache===0.6.2
+elasticsearch===2.4.0
+enum34===1.1.6
+eventlet===0.19.0
+extras===1.0.0
+fairy-slipper===0.2.0
+falcon===1.0.0
+fasteners===0.14.1
+fixtures===3.0.0
+freezegun===0.3.7
+frozendict===1.0
+funcparserlib===0.3.6
+futures===3.0.5
+futurist===0.18.0
+gabbi===1.24.0
+gitdb===0.6.4
+glance-store===0.18.0
+google-api-python-client===1.5.3
+graphviz===0.4.10
+greenlet===0.4.10
+heat-translator===0.5.0
+hiredis===0.2.0
+httplib2===0.9.2
+icalendar===3.10
+ironic-lib===2.1.3
+iso8601===0.1.11
+itsdangerous===0.24
+jmespath===0.9.0
+jsonpatch===1.14
+jsonpath-rw===1.4.0
+jsonpath-rw-ext===1.0.0
+jsonpointer===1.10
+jsonschema===2.5.1
+kafka-python===0.9.5
+kazoo===2.2.1
+keyring===9.3.1
+keystoneauth1===2.12.3
+keystonemiddleware===4.9.1
+kombu===3.0.35
+krest===1.3.1
+ldap3===1.4.0
+ldappool===2.1.0
+libvirt-python===2.1.0
+linecache2===1.0.0
+logilab-common===1.2.2
+logutils===0.3.3
+lxml===3.6.4
+microversion-parse===0.1.4
+mistral===3.0.2
+mock===2.0.0
+monasca-common===1.0.0
+monasca-statsd===1.1.0
+monotonic===1.2
+mox===0.5.3
+mox3===0.18.0
+mpmath===0.19
+msgpack-python===0.4.8
+netaddr===0.7.18
+netifaces===0.10.5
+netmiko===0.5.6
+networkx===1.11
+neutron-lib===0.4.0
+nodeenv===0.13.6
+nose===1.3.7
+nose-exclude===0.4.1
+nosehtmloutput===0.0.5
+nosexcover===1.0.10
+notifier===1.0.3
+numpy===1.11.1
+oauth2client===3.0.0
+oauthlib===1.1.2
+openstack-doc-tools===1.0.1
+openstack.nose-plugin===0.11
+openstackdocstheme===1.5.0
+openstacksdk===0.9.5
+ordereddict===1.1
+os-api-ref===1.0.0
+os-apply-config===5.1.0
+os-brick===1.6.2
+os-client-config===1.21.1
+os-cloud-config===5.1.0
+os-collect-config===5.2.0
+os-refresh-config===5.2.0
+os-testr===0.8.0
+os-vif===1.2.1
+os-win===1.2.2
+osc-lib===1.1.0
+oslo.cache===1.14.1
+oslo.concurrency===3.14.1
+oslo.config===3.17.1
+oslo.context===2.9.0
+oslo.db===4.13.6
+oslo.i18n===3.9.0
+oslo.log===3.16.1
+oslo.messaging===5.10.2
+oslo.middleware===3.19.1
+oslo.policy===1.14.0
+oslo.privsep===1.13.2
+oslo.reports===1.14.0
+oslo.rootwrap===5.1.2
+oslo.serialization===2.13.2
+oslo.service===1.16.1
+oslo.utils===3.16.1
+oslo.versionedobjects===1.17.1
+oslo.vmware===2.14.1
+oslosphinx===4.7.0
+oslotest===2.10.1
+osprofiler===1.4.0
+packaging===16.8
+paramiko===2.0.2
+passlib===1.6.5
+pbr===1.10.0
+pecan===1.1.2
+pexpect===4.2.1
+pifpaf===0.12.0
+pika===0.10.0
+pika-pool===0.1.3
+ply===3.9
+positional===1.1.1
+posix-ipc===1.0.0
+prettytable===0.7.2
+proboscis===1.2.6.0
+psutil===1.2.1
+psycopg2===2.6.2
+ptyprocess===0.5.1
+py===1.4.31
+pyOpenSSL===16.2.0
+pyScss===1.3.4
+pyasn1===0.1.9
+pyasn1-modules===0.0.8
+pycadf===2.4.0
+pycparser===2.14
+pycrypto===2.6.1
+pydotplus===2.0.2
+pyghmi===1.0.9
+pyinotify===0.9.6
+pyldap===2.4.25.1
+pylxd===2.0.3
+pymemcache===1.3.6
+pymod2pkg===0.5.4
+pymongo===3.3.0
+pyngus===2.1.2
+pyparsing===2.1.10
+pyroute2===0.4.6
+pysaml2===4.0.2
+pysendfile===2.0.1
+pysmi===0.0.7
+pysnmp===4.3.2
+pystache===0.5.4
+pytest===3.0.1
+python-barbicanclient===4.0.1
+python-ceilometerclient===2.6.2
+python-cinderclient===1.9.0
+python-congressclient===1.5.0
+python-consul===0.6.1
+python-dateutil===2.5.3
+python-designateclient===2.3.0
+python-editor===1.0.1
+python-glanceclient===2.5.0
+python-heatclient===1.5.2
+python-ironic-inspector-client===1.10.0
+python-ironicclient===1.7.1
+python-k8sclient===0.3.0
+python-karborclient===0.1.0
+python-keystoneclient===3.5.1
+python-magnumclient===2.3.1
+python-manilaclient===1.11.0
+python-memcached===1.58
+python-mimeparse===1.5.2
+python-mistralclient===2.1.2
+python-monascaclient===1.2.1
+python-muranoclient===0.11.1
+python-neutronclient===6.0.1
+python-novaclient===6.0.2
+python-openstackclient===3.2.1
+python-pytun===2.2.1
+python-qpid-proton===0.14.0
+python-saharaclient===0.18.0
+python-searchlightclient===1.0.0
+python-senlinclient===1.0.0
+python-smaugclient===0.0.8
+python-solumclient===2.0.1
+python-statsd===2.0.0
+python-subunit===1.2.0
+python-swiftclient===3.1.0
+python-tackerclient===0.7.0
+python-troveclient===2.5.0
+python-watcherclient===0.25.1
+python-zaqarclient===1.2.0
+pytz===2016.6.1
+pyudev===0.21.0
+pyzabbix===0.7.4
+pyzmq===15.4.0
+rcssmin===1.0.6
+redis===2.10.5
+reno===1.9.0
+repoze.lru===0.6
+repoze.who===2.3
+requests-aws===0.1.8
+requests-mock===1.0.0
+requests-unixsocket===0.1.5
+requestsexceptions===1.1.3
+restructuredtext-lint===0.17.0
+retrying===1.3.3
+rfc3986===0.4.1
+rjsmin===1.0.12
+rsa===3.4.2
+rtslib-fb===2.1.58
+ryu===4.5
+scikit-learn===0.17.1
+scipy===0.18.0
+scp===0.10.2
+semantic-version===2.5.0
+seqdiag===0.9.5
+simplegeneric===0.8.1
+simplejson===3.8.2
+six===1.10.0
+smmap===0.9.0
+spec-cleaner===0.9.0
+sphinxcontrib-blockdiag===1.5.5
+sphinxcontrib-httpdomain===1.5.0
+sphinxcontrib-pecanwsme===0.8.0
+sphinxcontrib-seqdiag===0.8.5
+sqlalchemy-migrate===0.10.0
+sqlparse===0.2.1
+stevedore===1.17.1
+suds-jurko===0.6
+sympy===1.0
+sysv-ipc===0.7.0
+tablib===0.11.2
+taskflow===2.6.1
+tempest===12.1.0
+tempest-lib===1.0.0
+tenacity===3.0.0
+termcolor===1.1.0
+testrepository===0.0.20
+testresources===2.0.1
+testscenarios===0.5.0
+testtools===2.2.0
+tooz===1.43.2
+tosca-parser===0.6.0
+traceback2===1.4.0
+tripleo-common===5.4.4
+trollius===2.1
+txaio===2.5.1
+tzlocal===1.2.2
+ujson===1.35
+unittest2===1.1.0
+uritemplate===0.6
+virtualenv===15.0.3
+voluptuous===0.9.3
+waitress===1.0.0
+warlock===1.2.0
+webcolors===1.5
+websocket-client===0.37.0
+websockify===0.8.0
+wrapt===1.10.8
+ws4py===0.3.4
+wsgi-intercept===1.3.1
+xattr===0.8.0
+xmltodict===0.10.2
+xvfbwrapper===0.2.8
+yaql===1.1.2
+zake===0.2.2
+zope.interface===4.3.1
+virtualbmc===0.1.0
+ansible===2.9.2
+xtesting===0.91.0
+bandit===1.1.0
+ruamel.yaml.jinja2==0.2.2
+ujson===2.0.3
+ruamel.yaml===0.15.100
+sphinxcontrib-spelling===4.3.0
+kubernetes===11.0.0
+ansible-lint===4.2.0
+setuptools_scm===6.0.1
\ No newline at end of file