diff options
author | liamfallon <liam.fallon@est.tech> | 2021-01-06 15:34:58 +0000 |
---|---|---|
committer | S�bastien Determe <sebastien.determe@intl.att.com> | 2021-01-06 18:36:04 +0000 |
commit | 79b5636be43054a0c2ec7ab2450edc347e1d5043 (patch) | |
tree | 5c1947c4f0639e0d1c4816fe841d286677a31637 /src/test/resources/robotframework | |
parent | b6d7a6d192eddc0c52497603023e47f10599c2ae (diff) |
Merge clamp master into tosca-poc branch
This change mreges changes in clamp master into the tosca-poc branch
because the two banches have diverged.
Issue-ID: POLICY-2971
Change-Id: Iea4efe90204c98eeaae0b112ad5c964f722afdb0
Signed-off-by: liamfallon <liam.fallon@est.tech>
Diffstat (limited to 'src/test/resources/robotframework')
-rw-r--r-- | src/test/resources/robotframework/Dockerfile | 12 | ||||
-rw-r--r-- | src/test/resources/robotframework/robotframework-test.properties | 2 |
2 files changed, 5 insertions, 9 deletions
diff --git a/src/test/resources/robotframework/Dockerfile b/src/test/resources/robotframework/Dockerfile index 4ae08208e..7e0bf8a26 100644 --- a/src/test/resources/robotframework/Dockerfile +++ b/src/test/resources/robotframework/Dockerfile @@ -1,9 +1,5 @@ -#FROM robotframework/rfdocker -# -#### Uncomment following two lines if having external test libraries: -##COPY --chown=robot:robot requirements.txt . -#RUN pip3 install --no-cache-dir -r requirements.txt -#COPY *.robot /home/robot/atest -FROM ppodgorsek/robot-framework:3.0.3 +FROM ppodgorsek/robot-framework:latest + +USER root COPY requirements.txt . -RUN pip install -r requirements.txt
\ No newline at end of file +RUN pip3 install --no-cache-dir -r requirements.txt
\ No newline at end of file diff --git a/src/test/resources/robotframework/robotframework-test.properties b/src/test/resources/robotframework/robotframework-test.properties index 4ec657355..665842b84 100644 --- a/src/test/resources/robotframework/robotframework-test.properties +++ b/src/test/resources/robotframework/robotframework-test.properties @@ -160,7 +160,7 @@ clamp.config.security.permission.type.template=permission-type-template clamp.config.security.permission.type.tosca=permission-type-tosca #This one indicates the type of instances (dev|prod|perf...), this must be set accordingly in clds-users.properties clamp.config.security.permission.instance=dev -clamp.config.security.authentication.class=org.onap.aaf.cadi.principal.X509Principal +clamp.config.security.authentication.class=org.onap.aaf.cadi.principal.X509Principal, org.onap.aaf.cadi.principal.CachedBasicPrincipal # Configuration settings for CDS clamp.config.cds.url=http4://localhost:${docker.http-cache.port.host} |