From e0da464c1b8bfe7ceb1f16879a2c550e7348fe18 Mon Sep 17 00:00:00 2001 From: Jan Malkiewicz Date: Tue, 22 Sep 2020 08:04:23 +0200 Subject: [OOM-CMPv2] Rename truststoremerger->postprocessor Issue-ID: DCAEGEN2-2253 Signed-off-by: Jan Malkiewicz Change-Id: I6c7fa3378c86dee4e1fe23e4840046b979d942ea --- .../postprocessor/setup.sh | 28 ++++++++++++++++++++++ .../postprocessor/teardown.sh | 18 ++++++++++++++ .../postprocessor/testplan.txt | 3 +++ .../truststoremerger/setup.sh | 28 ---------------------- .../truststoremerger/teardown.sh | 18 -------------- .../truststoremerger/testplan.txt | 3 --- 6 files changed, 49 insertions(+), 49 deletions(-) create mode 100644 plans/oom-platform-cert-service/postprocessor/setup.sh create mode 100644 plans/oom-platform-cert-service/postprocessor/teardown.sh create mode 100755 plans/oom-platform-cert-service/postprocessor/testplan.txt delete mode 100644 plans/oom-platform-cert-service/truststoremerger/setup.sh delete mode 100644 plans/oom-platform-cert-service/truststoremerger/teardown.sh delete mode 100755 plans/oom-platform-cert-service/truststoremerger/testplan.txt (limited to 'plans/oom-platform-cert-service') diff --git a/plans/oom-platform-cert-service/postprocessor/setup.sh b/plans/oom-platform-cert-service/postprocessor/setup.sh new file mode 100644 index 00000000..2df82f76 --- /dev/null +++ b/plans/oom-platform-cert-service/postprocessor/setup.sh @@ -0,0 +1,28 @@ +#!/bin/bash +# +# Copyright 2020 Nokia. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +#export container name +export CertServicePostProcessorContainerName=CertServicePostProcessor + +#install docker sdk +echo "Uninstall docker-py and reinstall docker." +pip uninstall -y docker-py +pip uninstall -y docker +pip install -U docker==2.7.0 + +#install pyjks for .jks files management +pip install pyjks diff --git a/plans/oom-platform-cert-service/postprocessor/teardown.sh b/plans/oom-platform-cert-service/postprocessor/teardown.sh new file mode 100644 index 00000000..22744162 --- /dev/null +++ b/plans/oom-platform-cert-service/postprocessor/teardown.sh @@ -0,0 +1,18 @@ +#!/bin/bash +# +# Copyright 2017 ZTE, Inc. and others. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +kill-instance.sh ${CertServicePostProcessorContainerName} diff --git a/plans/oom-platform-cert-service/postprocessor/testplan.txt b/plans/oom-platform-cert-service/postprocessor/testplan.txt new file mode 100755 index 00000000..edbd11cc --- /dev/null +++ b/plans/oom-platform-cert-service/postprocessor/testplan.txt @@ -0,0 +1,3 @@ +# Test suites are relative paths under [integration/csit.git]/tests/. +# Place the suites in run order. +oom-platform-cert-service/postprocessor diff --git a/plans/oom-platform-cert-service/truststoremerger/setup.sh b/plans/oom-platform-cert-service/truststoremerger/setup.sh deleted file mode 100644 index 9f618406..00000000 --- a/plans/oom-platform-cert-service/truststoremerger/setup.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash -# -# Copyright 2020 Nokia. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -#export container name -export MergerContainerName=TrustStoreMerger - -#install docker sdk -echo "Uninstall docker-py and reinstall docker." -pip uninstall -y docker-py -pip uninstall -y docker -pip install -U docker==2.7.0 - -#install pyjks for .jks files management -pip install pyjks diff --git a/plans/oom-platform-cert-service/truststoremerger/teardown.sh b/plans/oom-platform-cert-service/truststoremerger/teardown.sh deleted file mode 100644 index a0ee4d26..00000000 --- a/plans/oom-platform-cert-service/truststoremerger/teardown.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash -# -# Copyright 2017 ZTE, Inc. and others. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -kill-instance.sh ${MergerContainerName} diff --git a/plans/oom-platform-cert-service/truststoremerger/testplan.txt b/plans/oom-platform-cert-service/truststoremerger/testplan.txt deleted file mode 100755 index 11e00832..00000000 --- a/plans/oom-platform-cert-service/truststoremerger/testplan.txt +++ /dev/null @@ -1,3 +0,0 @@ -# Test suites are relative paths under [integration/csit.git]/tests/. -# Place the suites in run order. -oom-platform-cert-service/truststoremerger -- cgit 1.2.3-korg