From dc396847579288b9049135833fad6080b96179b0 Mon Sep 17 00:00:00 2001 From: kaihlavi Date: Wed, 26 Jun 2019 15:09:37 +0300 Subject: Adjust DCAE-DS CSIT for Jenkins and to master - directory structures of DCAE-DS CSIT plans, scripts and tests have been changed to be more compatible with jjb templates to enable working Jenkins jobs - robot tests adjusted to latest changes in robotframework-onap library Change-Id: Id05602a88557267cc7ae77f066877680ae431a7f Issue-ID: SDC-2365 Signed-off-by: kaihlavi --- plans/sdc-dcae-d/dcaed/setup.sh | 18 ++++++++++++++++++ plans/sdc-dcae-d/dcaed/teardown.sh | 18 ++++++++++++++++++ plans/sdc-dcae-d/dcaed/testplan.txt | 3 +++ plans/sdc/dcaed/setup.sh | 18 ------------------ plans/sdc/dcaed/teardown.sh | 18 ------------------ plans/sdc/dcaed/testplan.txt | 3 --- 6 files changed, 39 insertions(+), 39 deletions(-) create mode 100644 plans/sdc-dcae-d/dcaed/setup.sh create mode 100644 plans/sdc-dcae-d/dcaed/teardown.sh create mode 100644 plans/sdc-dcae-d/dcaed/testplan.txt delete mode 100644 plans/sdc/dcaed/setup.sh delete mode 100644 plans/sdc/dcaed/teardown.sh delete mode 100644 plans/sdc/dcaed/testplan.txt (limited to 'plans') diff --git a/plans/sdc-dcae-d/dcaed/setup.sh b/plans/sdc-dcae-d/dcaed/setup.sh new file mode 100644 index 00000000..5a94a939 --- /dev/null +++ b/plans/sdc-dcae-d/dcaed/setup.sh @@ -0,0 +1,18 @@ +#!/bin/bash +# +# Copyright 2019 © Samsung Electronics Co., Ltd. +# +# 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. +# + +source ${WORKSPACE}/scripts/sdc-dcae-d/setup_sdc_dcaed.sh diff --git a/plans/sdc-dcae-d/dcaed/teardown.sh b/plans/sdc-dcae-d/dcaed/teardown.sh new file mode 100644 index 00000000..2467d1e9 --- /dev/null +++ b/plans/sdc-dcae-d/dcaed/teardown.sh @@ -0,0 +1,18 @@ +#!/bin/bash +# +# Copyright 2019 © Samsung Electronics Co., Ltd. +# +# 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. +# + +source ${WORKSPACE}/scripts/sdc-dcae-d/cleanup_sdc_dcaed.sh diff --git a/plans/sdc-dcae-d/dcaed/testplan.txt b/plans/sdc-dcae-d/dcaed/testplan.txt new file mode 100644 index 00000000..63a4cda4 --- /dev/null +++ b/plans/sdc-dcae-d/dcaed/testplan.txt @@ -0,0 +1,3 @@ +# Test suites are relative paths under [integration/csit.git]/tests/. +# Place the suites in run order. +sdc-dcae-d/dcaed diff --git a/plans/sdc/dcaed/setup.sh b/plans/sdc/dcaed/setup.sh deleted file mode 100644 index 074b8c05..00000000 --- a/plans/sdc/dcaed/setup.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash -# -# Copyright 2019 © Samsung Electronics Co., Ltd. -# -# 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. -# - -source ${WORKSPACE}/scripts/sdc/setup_sdc_dcaed.sh diff --git a/plans/sdc/dcaed/teardown.sh b/plans/sdc/dcaed/teardown.sh deleted file mode 100644 index 911273c2..00000000 --- a/plans/sdc/dcaed/teardown.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash -# -# Copyright 2019 © Samsung Electronics Co., Ltd. -# -# 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. -# - -source ${WORKSPACE}/scripts/sdc/cleanup_sdc_dcaed.sh diff --git a/plans/sdc/dcaed/testplan.txt b/plans/sdc/dcaed/testplan.txt deleted file mode 100644 index a1313f18..00000000 --- a/plans/sdc/dcaed/testplan.txt +++ /dev/null @@ -1,3 +0,0 @@ -# Test suites are relative paths under [integration/csit.git]/tests/. -# Place the suites in run order. -sdc/dcaed -- cgit 1.2.3-korg