From f59a22539d5b372e2425c39963547985379d6990 Mon Sep 17 00:00:00 2001 From: Yuli Shlosberg Date: Wed, 21 Mar 2018 11:14:08 +0200 Subject: new ui sanity docker Change-Id: I257c198c563771b5badcf36a479cb499f841682f Issue-ID: SDC-995 Signed-off-by: Yuli Shlosberg --- .../cookbooks/sdc-sanity/attributes/default.rb | 1 - .../files/default/Files/VNFs/Huawei_vHSS.csar | Bin 3100 -> 0 bytes .../files/default/Files/VNFs/Huawei_vMME.csar | Bin 2563 -> 0 bytes .../files/default/Files/VNFs/Huawei_vPCRF.csar | Bin 3836 -> 0 bytes .../Files/VNFs/Huawei_vPCRF_aligned_fixed.csar | Bin 3836 -> 0 bytes .../files/default/Files/VNFs/Huawei_vSPGW.csar | Bin 3907 -> 0 bytes .../default/Files/VNFs/Huawei_vSPGW_fixed.csar | Bin 3887 -> 0 bytes .../files/default/Files/VNFs/ZteEpcMmeVf.csar | Bin 4790 -> 0 bytes .../default/Files/VNFs/ZteEpcSpgwVf-csar.csar | Bin 2804 -> 0 bytes .../files/default/Files/VNFs/ZteEpcSpgwVf.csar | Bin 2804 -> 0 bytes .../files/default/Files/VNFs/base_vfw.zip | Bin 3522 -> 0 bytes .../files/default/Files/VNFs/base_vvg.zip | Bin 944 -> 0 bytes .../files/default/Files/VNFs/cscf_si.csar | Bin 50982 -> 0 bytes .../files/default/Files/VNFs/cscf_si_fixed.csar | Bin 50982 -> 0 bytes .../sdc-sanity/files/default/Files/VNFs/infra.zip | Bin 4155 -> 0 bytes .../Files/VNFs/resource-ZteEpcMmeVf-csar_fix.csar | Bin 4790 -> 0 bytes .../sdc-sanity/files/default/Files/VNFs/vCSCF.csar | Bin 4290 -> 0 bytes .../files/default/Files/VNFs/vCSCF_aligned.csar | Bin 4290 -> 0 bytes .../files/default/Files/VNFs/vCSCF_v3.0.csar | Bin 44977 -> 0 bytes .../sdc-sanity/files/default/Files/VNFs/vLB.zip | Bin 6789 -> 0 bytes .../sdc-sanity/files/default/Files/VNFs/vSBC.csar | Bin 3771 -> 0 bytes .../files/default/Files/VNFs/vSBC_aligned.csar | Bin 3771 -> 0 bytes .../sdc-sanity/files/default/Files/VNFs/vbng.zip | Bin 3704 -> 0 bytes .../files/default/Files/VNFs/vbrgemu.zip | Bin 3325 -> 0 bytes .../sdc-sanity/files/default/Files/VNFs/vfw.zip | Bin 3522 -> 0 bytes .../sdc-sanity/files/default/Files/VNFs/vgmux.zip | Bin 3536 -> 0 bytes .../sdc-sanity/files/default/Files/VNFs/vgw.zip | Bin 3469 -> 0 bytes .../sdc-sanity/files/default/Files/VNFs/vvg.zip | Bin 944 -> 0 bytes .../files/default/conf/attsdc-packages.yaml | 12 -- .../sdc-sanity/files/default/conf/credentials.yaml | 48 -------- .../sdc-sanity/files/default/conf/log4j.properties | 34 ------ .../sdc-sanity/files/default/conf/logback.xml | 25 ---- .../sdc-sanity/files/default/startTest.sh | 129 --------------------- .../recipes/sanityTests_1_cleanup_jettydir.rb | 49 -------- .../recipes/sanityTests_2_setup_configuration.rb | 43 ------- .../recipes/sanityTests_3_sanity_execution.rb | 19 --- .../templates/default/BE-titan.properties.erb | 25 ---- .../templates/default/sdc-sanity.yaml.erb | 92 --------------- 38 files changed, 477 deletions(-) delete mode 100644 sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/attributes/default.rb delete mode 100644 sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/Huawei_vHSS.csar delete mode 100644 sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/Huawei_vMME.csar delete mode 100644 sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/Huawei_vPCRF.csar delete mode 100644 sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/Huawei_vPCRF_aligned_fixed.csar delete mode 100644 sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/Huawei_vSPGW.csar delete mode 100644 sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/Huawei_vSPGW_fixed.csar delete mode 100644 sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/ZteEpcMmeVf.csar delete mode 100644 sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/ZteEpcSpgwVf-csar.csar delete mode 100644 sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/ZteEpcSpgwVf.csar delete mode 100644 sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/base_vfw.zip delete mode 100644 sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/base_vvg.zip delete mode 100644 sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/cscf_si.csar delete mode 100644 sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/cscf_si_fixed.csar delete mode 100644 sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/infra.zip delete mode 100644 sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/resource-ZteEpcMmeVf-csar_fix.csar delete mode 100644 sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/vCSCF.csar delete mode 100644 sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/vCSCF_aligned.csar delete mode 100644 sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/vCSCF_v3.0.csar delete mode 100644 sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/vLB.zip delete mode 100644 sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/vSBC.csar delete mode 100644 sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/vSBC_aligned.csar delete mode 100644 sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/vbng.zip delete mode 100644 sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/vbrgemu.zip delete mode 100644 sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/vfw.zip delete mode 100644 sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/vgmux.zip delete mode 100644 sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/vgw.zip delete mode 100644 sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/vvg.zip delete mode 100644 sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/conf/attsdc-packages.yaml delete mode 100644 sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/conf/credentials.yaml delete mode 100644 sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/conf/log4j.properties delete mode 100644 sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/conf/logback.xml delete mode 100644 sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/startTest.sh delete mode 100644 sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/recipes/sanityTests_1_cleanup_jettydir.rb delete mode 100644 sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/recipes/sanityTests_2_setup_configuration.rb delete mode 100644 sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/recipes/sanityTests_3_sanity_execution.rb delete mode 100644 sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/templates/default/BE-titan.properties.erb delete mode 100644 sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/templates/default/sdc-sanity.yaml.erb (limited to 'sdc-os-chef/sdc-sanity/chef-repo') diff --git a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/attributes/default.rb b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/attributes/default.rb deleted file mode 100644 index 4287ca8617..0000000000 --- a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/attributes/default.rb +++ /dev/null @@ -1 +0,0 @@ -# \ No newline at end of file diff --git a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/Huawei_vHSS.csar b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/Huawei_vHSS.csar deleted file mode 100644 index ea5c1283be..0000000000 Binary files a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/Huawei_vHSS.csar and /dev/null differ diff --git a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/Huawei_vMME.csar b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/Huawei_vMME.csar deleted file mode 100644 index f921f46e06..0000000000 Binary files a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/Huawei_vMME.csar and /dev/null differ diff --git a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/Huawei_vPCRF.csar b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/Huawei_vPCRF.csar deleted file mode 100644 index 6f997bcf98..0000000000 Binary files a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/Huawei_vPCRF.csar and /dev/null differ diff --git a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/Huawei_vPCRF_aligned_fixed.csar b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/Huawei_vPCRF_aligned_fixed.csar deleted file mode 100644 index 6f997bcf98..0000000000 Binary files a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/Huawei_vPCRF_aligned_fixed.csar and /dev/null differ diff --git a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/Huawei_vSPGW.csar b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/Huawei_vSPGW.csar deleted file mode 100644 index e7eed4b7c6..0000000000 Binary files a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/Huawei_vSPGW.csar and /dev/null differ diff --git a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/Huawei_vSPGW_fixed.csar b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/Huawei_vSPGW_fixed.csar deleted file mode 100644 index fa83c17d20..0000000000 Binary files a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/Huawei_vSPGW_fixed.csar and /dev/null differ diff --git a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/ZteEpcMmeVf.csar b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/ZteEpcMmeVf.csar deleted file mode 100644 index bf0e775102..0000000000 Binary files a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/ZteEpcMmeVf.csar and /dev/null differ diff --git a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/ZteEpcSpgwVf-csar.csar b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/ZteEpcSpgwVf-csar.csar deleted file mode 100644 index 0eacd74655..0000000000 Binary files a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/ZteEpcSpgwVf-csar.csar and /dev/null differ diff --git a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/ZteEpcSpgwVf.csar b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/ZteEpcSpgwVf.csar deleted file mode 100644 index 0eacd74655..0000000000 Binary files a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/ZteEpcSpgwVf.csar and /dev/null differ diff --git a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/base_vfw.zip b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/base_vfw.zip deleted file mode 100644 index b8273defea..0000000000 Binary files a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/base_vfw.zip and /dev/null differ diff --git a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/base_vvg.zip b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/base_vvg.zip deleted file mode 100644 index dc9ef5d823..0000000000 Binary files a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/base_vvg.zip and /dev/null differ diff --git a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/cscf_si.csar b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/cscf_si.csar deleted file mode 100644 index da19f0dd29..0000000000 Binary files a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/cscf_si.csar and /dev/null differ diff --git a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/cscf_si_fixed.csar b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/cscf_si_fixed.csar deleted file mode 100644 index bc8397a86e..0000000000 Binary files a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/cscf_si_fixed.csar and /dev/null differ diff --git a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/infra.zip b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/infra.zip deleted file mode 100644 index 09eb9cd648..0000000000 Binary files a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/infra.zip and /dev/null differ diff --git a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/resource-ZteEpcMmeVf-csar_fix.csar b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/resource-ZteEpcMmeVf-csar_fix.csar deleted file mode 100644 index bf0e775102..0000000000 Binary files a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/resource-ZteEpcMmeVf-csar_fix.csar and /dev/null differ diff --git a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/vCSCF.csar b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/vCSCF.csar deleted file mode 100644 index 347b8bcced..0000000000 Binary files a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/vCSCF.csar and /dev/null differ diff --git a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/vCSCF_aligned.csar b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/vCSCF_aligned.csar deleted file mode 100644 index 347b8bcced..0000000000 Binary files a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/vCSCF_aligned.csar and /dev/null differ diff --git a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/vCSCF_v3.0.csar b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/vCSCF_v3.0.csar deleted file mode 100644 index 094810a3f7..0000000000 Binary files a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/vCSCF_v3.0.csar and /dev/null differ diff --git a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/vLB.zip b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/vLB.zip deleted file mode 100644 index b61ca1b83b..0000000000 Binary files a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/vLB.zip and /dev/null differ diff --git a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/vSBC.csar b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/vSBC.csar deleted file mode 100644 index ee60eed872..0000000000 Binary files a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/vSBC.csar and /dev/null differ diff --git a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/vSBC_aligned.csar b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/vSBC_aligned.csar deleted file mode 100644 index ee60eed872..0000000000 Binary files a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/vSBC_aligned.csar and /dev/null differ diff --git a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/vbng.zip b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/vbng.zip deleted file mode 100644 index ab5163d9ed..0000000000 Binary files a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/vbng.zip and /dev/null differ diff --git a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/vbrgemu.zip b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/vbrgemu.zip deleted file mode 100644 index 28c69a570f..0000000000 Binary files a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/vbrgemu.zip and /dev/null differ diff --git a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/vfw.zip b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/vfw.zip deleted file mode 100644 index b8273defea..0000000000 Binary files a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/vfw.zip and /dev/null differ diff --git a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/vgmux.zip b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/vgmux.zip deleted file mode 100644 index 56de952150..0000000000 Binary files a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/vgmux.zip and /dev/null differ diff --git a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/vgw.zip b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/vgw.zip deleted file mode 100644 index 7a14718c2c..0000000000 Binary files a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/vgw.zip and /dev/null differ diff --git a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/vvg.zip b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/vvg.zip deleted file mode 100644 index dc9ef5d823..0000000000 Binary files a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/vvg.zip and /dev/null differ diff --git a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/conf/attsdc-packages.yaml b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/conf/attsdc-packages.yaml deleted file mode 100644 index 5d1a3e1537..0000000000 --- a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/conf/attsdc-packages.yaml +++ /dev/null @@ -1,12 +0,0 @@ -packages: - - org.openecomp.sdc.ci.tests.execute.general - - org.openecomp.sdc.ci.tests.execute.user - - org.openecomp.sdc.ci.tests.execute.property - - org.openecomp.sdc.ci.tests.execute.lifecycle - - org.openecomp.sdc.ci.tests.execute.resource - - org.openecomp.sdc.ci.tests.execute.service - - org.openecomp.sdc.ci.tests.execute.artifacts - - org.openecomp.sdc.ci.tests.execute.imports - - org.openecomp.sdc.ci.tests.execute.category - - org.openecomp.sdc.ci.tests.execute.distribution - - org.openecomp.sdc.ci.tests.execute.product \ No newline at end of file diff --git a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/conf/credentials.yaml b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/conf/credentials.yaml deleted file mode 100644 index ab37f7bee8..0000000000 --- a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/conf/credentials.yaml +++ /dev/null @@ -1,48 +0,0 @@ - designer: { - username: cs0008, - password: 123123a, - firstname: ASDC, - lastname: KASPIN - } - admin: { - username: jh0003, - password: 123123a, - firstname: ASDC, - lastname: KASPIN - } - ops: { - username: af0006, - password: 123123a, - firstname: ASDC, - lastname: KASPIN - } - tester: { - username: kb0004, - password: 123123a, - firstname: ASDC, - lastname: KASPIN - } - governor: { - username: ah0002, - password: 123123a, - firstname: ASDC, - lastname: KASPIN - } - product_strategist: { - username: m99126, - password: 1910-FruitGum, - firstname: ASDC, - lastname: KASPIN - } - product_manager: { - username: m99127, - password: 747-Airplane, - firstname: ASDC, - lastname: KASPIN - } - product_local: { - username: pm0001, - password: 123123a, - firstname: ASDC, - lastname: KASPIN - } \ No newline at end of file diff --git a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/conf/log4j.properties b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/conf/log4j.properties deleted file mode 100644 index d313e92b55..0000000000 --- a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/conf/log4j.properties +++ /dev/null @@ -1,34 +0,0 @@ -# Define the root logger with appender file -log4j.rootLogger = INFO, FILE, stdout - -# Define the file appender -log4j.appender.FILE=org.apache.log4j.RollingFileAppender -log4j.appender.FILE.File=${targetlog}logs/ci-log.out - -# Define the layout for file appender -log4j.appender.FILE.layout=org.apache.log4j.PatternLayout -log4j.appender.FILE.layout.conversionPattern=%d{yyyy-MM-dd HH:mm:ss} %5p [%10c] : %m%n - -# Set the maximum file size before rollover -log4j.appender.FILE.maxFileSize=5MB - -# Set the the backup index -log4j.appender.FILE.maxBackupIndex=10 - - -############################################################# - -# Direct log messages to stdout -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.Target=System.out -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -#log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n -log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %5p %10c:%L - %m%n - -log4j.logger.org.apache.cassandra.service.StorageProxy=INFO -log4j.logger.com.thinkaurelius.titan.diskstorage.cassandra.CassandraTransaction=INFO, FILE, stdout - -log4j.logger.org.openecomp.sdc.ci.tests.utils=INFO, FILE, stdout -log4j.additivity.org.openecomp.sdc.ci.tests.utils=false - - diff --git a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/conf/logback.xml b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/conf/logback.xml deleted file mode 100644 index b41ee12695..0000000000 --- a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/conf/logback.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - %d{yyyy-MM-dd HH:mm:ss} | %-5p | [%thread] %logger{5}:%L - %msg%n - - - - - logFile.log - true - - %d{yyyy-MM-dd HH:mm:ss} | %-5p | [%thread] %logger{5}:%L - %msg%n - - - - - - - - - - - \ No newline at end of file diff --git a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/startTest.sh b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/startTest.sh deleted file mode 100644 index 35821dd24d..0000000000 --- a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/startTest.sh +++ /dev/null @@ -1,129 +0,0 @@ -#!/bin/bash -REMOTE_DEBUG=false -RERUN=false -JAVA_OPTION="" -debug_port=8000 -TEST_SUITES=testSuites -fileName=testng-failed.xml - -function help_usage () -{ - echo - echo "$0 ( ) [-r/rerun -d/debug ]" - echo "nohup ./startTest.sh ui-ci-1707.0.5-SNAPSHOT-jar-with-dependencies.jar extendedSanity.xml -r false -d true &" - echo "by default rerun is true and remote debug is false." - echo - exit 2 -} - -function isBoolean () -{ - PARAM_NAME=$1 - VALUE=$2 - if [[ ${VALUE} != "true" ]] && [[ ${VALUE} != "false" ]]; then - echo "Valid parameter" ${PARAM_NAME} "values are: true/false" - help_usage - fi -} - -function prepareFailedXmlFile () -{ - echo "1="$1 "2="$2 "fileName="${fileName} - PATTERN=`grep -w "test name=" ${FULL_PATH}/${TEST_SUITES}/$2 | awk -F'"' '{print $2}'` - sed '/ ${FULL_PATH}/${TEST_SUITES}/${fileName} - sed -i 's/thread-count="[0-9]\+"/thread-count="1"/g' ${FULL_PATH}/${TEST_SUITES}/${fileName} -} - -#main -[ $# -lt 2 ] && help_usage - -JAR_FILE=$1 -SUITE_FILE=$2 - -while [ $# -ne 0 ]; do - case $1 in - -r|rerun) - RERUN=$2 - isBoolean $1 ${RERUN} - shift 1 - shift 1 - ;; - -d|debug) - REMOTE_DEBUG=$2 - isBoolean $1 ${REMOTE_DEBUG} - shift 1 - shift 1 - ;; - *) - shift 1 - ;; - esac -done - -CURRENT_DIR=`pwd` -BASEDIR=$(dirname $0) - -if [ ${BASEDIR:0:1} = "/" ] -then - FULL_PATH=$BASEDIR -else - FULL_PATH=$CURRENT_DIR/$BASEDIR -fi -LOGS_PROP_FILE=file:${FULL_PATH}/conf/log4j.properties -############################################# -TARGET_DIR=${FULL_PATH}/target -CONF_FILE=${FULL_PATH}/conf/sdc.yaml - -DEBUG=true -MainClass=org.openecomp.sdc.ci.tests.run.StartTest - -TESTS_DIR=/opt/app/sdc/ci/resources/tests -COMPONENTS_DIR=/opt/app/sdc/ci/resources/components - - -TARGET_LOG_DIR="${TARGET_DIR}/" - -######ADD USERS################ - -BE_IP=`cat conf/attsdc.yaml | grep catalogBeHost| awk '{print $2}'` - - -if [ ${REMOTE_DEBUG} == "true" ]; then - echo "Debug mode, Listen on port $debug_port"; - JAVA_OPTION="-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=${debug_port}" ; -fi - -cmd="java $JAVA_OPTION -Xms512m -Xmx512m -DdisplayException=true -Dtargetlog=${TARGET_LOG_DIR} -Dfilepath=${FILES_TEST} -Dconfig.resource=${CONF_FILE} -Ddebug=${DEBUG} -Dlog4j.configuration=${LOGS_PROP_FILE} -cp $JAR_FILE ${MainClass} $SUITE_FILE &" - - -if [ $DEBUG == "true" ] -then - $cmd -else - $cmd >> /dev/null -fi - -if [ ${RERUN} == "true" ]; then - if [ -f ${TARGET_DIR}/${fileName} ]; then - echo "Prepare" ${TARGET_DIR}/${fileName} "file to rerun all failed tests ..."; - prepareFailedXmlFile ${TARGET_DIR}/${fileName} $SUITE_FILE; - SUITE_FILE=${fileName}; - cmd="java $JAVA_OPTION -Xms512m -Xmx512m -DdisplayException=true -Dtargetlog=${TARGET_LOG_DIR} -Dfilepath=${FILES_TEST} -Dconfig.resource=${CONF_FILE} -Ddebug=${DEBUG} -Dlog4j.configuration=${LOGS_PROP_FILE} -cp $JAR_FILE ${MainClass} $SUITE_FILE &" - $cmd; - fi -fi - -status=`echo $?` - -source ExtentReport/versions.info -now=$(date +'%Y-%m-%d_%H_%M') -REPORT_NAME=${now} -VERSION=${osVersion} - - - -echo "##################################################" -echo "################# status is ${status} #################" -echo "##################################################" - -exit $status \ No newline at end of file diff --git a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/recipes/sanityTests_1_cleanup_jettydir.rb b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/recipes/sanityTests_1_cleanup_jettydir.rb deleted file mode 100644 index 112cc4c2e7..0000000000 --- a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/recipes/sanityTests_1_cleanup_jettydir.rb +++ /dev/null @@ -1,49 +0,0 @@ -tests_base="/var/lib/tests" - - remote_directory '/var/lib/tests/testSuites' do - source 'testSuites' - owner 'root' - group 'root' - mode '0755' - action :create - end - - remote_directory '/var/lib/tests/Files' do - source 'Files' - owner 'root' - group 'root' - mode '0755' - action :create - end - - remote_directory '/var/lib/tests/conf' do - source 'conf' - owner 'root' - group 'root' - mode '0755' - action :create - end - - directory "create_target_dir" do - path "/var/lib/tests/target" - owner 'root' - group 'root' - mode '0755' - action :create - end - - directory "create_ExtentReport_dir" do - path "/var/lib/tests/ExtentReport" - owner 'root' - group 'root' - mode '0755' - action :create - end - - cookbook_file '/var/lib/tests/startTest.sh' do - source 'startTest.sh' - owner 'root' - group 'root' - mode '0755' - action :create - end \ No newline at end of file diff --git a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/recipes/sanityTests_2_setup_configuration.rb b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/recipes/sanityTests_2_setup_configuration.rb deleted file mode 100644 index cf6875746e..0000000000 --- a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/recipes/sanityTests_2_setup_configuration.rb +++ /dev/null @@ -1,43 +0,0 @@ -tests_base="/var/lib/tests" - -template "sdc-yaml-config" do - path "#{tests_base}/conf/sdc.yaml" - source "sdc-sanity.yaml.erb" - owner "root" - group "root" - mode "0755" - variables ({ - :target_path => "#{tests_base}/target", - :catalogBE_ip => node['Nodes']['BE'], - :catalogBE_port => node['BE'][:http_port], - :webportal_ip => node['Nodes']['FE'], - :webportal_port => node['FE'][:http_port], - :titan_file => "#{tests_base}/conf/titan.properties", - :tests_base_ci => "#{tests_base}/CI/tests", - :components_path => "#{tests_base}/CI/components", - :importResourceConfigDir => "#{tests_base}/CI/importResource", - :importTypesDir => "#{tests_base}/CI/importTypesTest", - :importResourceTestsConfigDir => "#{tests_base}/CI/importResourceTests", - :ConfigurationFile => "#{tests_base}/conf/configuration.yaml", - :errorConfigurationFile => "#{tests_base}/conf/error-configuration.yaml", - :CASSANDRA_IP => node['Nodes']['CS'], - :CASSANDRA_PWD => node['cassandra'][:cassandra_password], - :CASSANDRA_USR => node['cassandra'][:cassandra_user] - }) -end - -replication_factor=1 -template "titan.properties" do - path "/#{tests_base}/conf/titan.properties" - source "BE-titan.properties.erb" - owner "root" - group "root" - mode "0755" - variables({ - :CASSANDRA_IP => node['Nodes']['CS'], - :CASSANDRA_PWD => node['cassandra'][:cassandra_password], - :CASSANDRA_USR => node['cassandra'][:cassandra_user], - :rep_factor => replication_factor, - :DC_NAME => node['cassandra'][:cluster_name]+node.chef_environment - }) -end \ No newline at end of file diff --git a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/recipes/sanityTests_3_sanity_execution.rb b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/recipes/sanityTests_3_sanity_execution.rb deleted file mode 100644 index 0ffa48d6ed..0000000000 --- a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/recipes/sanityTests_3_sanity_execution.rb +++ /dev/null @@ -1,19 +0,0 @@ -tests_base="/var/lib/tests" -ci_test_suite="onap.xml" - -bash "echo status" do - code <<-EOH - echo "DOCKER STARTED" - EOH -end - -bash "run asdc ci sanity tests" do -cwd "#{tests_base}" -code <<-EOH - cd "#{tests_base}" - jar_file=`ls test-apis*-jar-with-dependencies.jar` - ./startTest.sh $jar_file #{ci_test_suite} > #{tests_base}/target/startTest.log 2>&1 - echo "return code from startTest.sh = [$?]" - echo "DOCKER STARTED" -EOH -end diff --git a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/templates/default/BE-titan.properties.erb b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/templates/default/BE-titan.properties.erb deleted file mode 100644 index a42c7bf206..0000000000 --- a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/templates/default/BE-titan.properties.erb +++ /dev/null @@ -1,25 +0,0 @@ -storage.backend=cassandra -storage.hostname=<%= @CASSANDRA_IP %> -storage.port=9160 -storage.username=<%= @CASSANDRA_USR %> -storage.password=<%= @CASSANDRA_PWD %> -storage.connection-timeout=10000 -storage.cassandra.keyspace=sdctitan - -storage.cassandra.ssl.enabled=false -storage.cassandra.ssl.truststore.location=/var/lib/jetty/config/.truststore -storage.cassandra.ssl.truststore.password=Aa123456 - -cache.db-cache = false -cache.db-cache-clean-wait = 20 -cache.db-cache-time = 180000 -cache.db-cache-size = 0.5 - -storage.cassandra.read-consistency-level=LOCAL_QUORUM -storage.cassandra.write-consistency-level=LOCAL_QUORUM -storage.cassandra.replication-strategy-class=org.apache.cassandra.locator.NetworkTopologyStrategy -storage.cassandra.replication-strategy-options=<%= @DC_NAME %>,<%= @rep_factor %> -storage.cassandra.astyanax.local-datacenter=<%= @DC_NAME %> - -storage.lock.retries=5 -storage.lock.wait-time=500 diff --git a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/templates/default/sdc-sanity.yaml.erb b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/templates/default/sdc-sanity.yaml.erb deleted file mode 100644 index 8dde3cdefe..0000000000 --- a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/templates/default/sdc-sanity.yaml.erb +++ /dev/null @@ -1,92 +0,0 @@ -outputFolder: <%= @target_path %> -reportName: index.html -esHost: eshost -disributionClientHost: disClient -catalogFeHost: <%= @webportal_ip %> -catalogFePort: <%= @webportal_port %> -catalogBeHost: <%= @catalogBE_ip %> -catalogBePort: <%= @catalogBE_port %> -disributionClientPort: 8181 -esPort: 9200 - - -resourceConfigDir: <%= @tests_path_ci %> -componentsConfigDir: <%= @components_path %> -importResourceConfigDir: <%= @importResourceConfigDir %> -importResourceTestsConfigDir: <%= @importResourceTestsConfigDir %> -errorConfigurationFile: <%= @errorConfigurationFile %> -configurationFile: <%= @ConfigurationFile %> -importTypesConfigDir: <%= @importTypesDir %> -titanPropertiesFile: <%= @titan_file %> -systemUnderDebug: true - -cassandraHost: <%= @CASSANDRA_IP %> -cassandraAuthenticate: true -cassandraUsername: <%= @CASSANDRA_USR %> -cassandraPassword: <%= @CASSANDRA_PWD %> -cassandraSsl: false -cassandraTruststorePath : /tmp/.truststore -cassandraTruststorePassword : Aa123456 -cassandraAuditKeySpace: sdcAudit -cassandraArtifactKeySpace: sdcArtifact - -# catalog backend protocol -<% if node[:disableHttp] -%> -sdcHttpMethod: https -<% else %> -sdcHttpMethod: http -<% end -%> - -localDataCenter: DC-Automate01 - -stopOnClassFailure: false - -#List of non-abstract resources to keep during titan cleanup between tests -#Only 1.0 version will be kept -resourcesNotToDelete: - - Compute - - Database - - ObjectStorage - - BlockStorage - - LoadBalancer - - Port - - Network - - Root - - ContainerApplication - - ContainerRuntime - - DBMS - - SoftwareComponent - - WebApplication - - WebServer - - CinderVolume - - ContrailVirtualNetwork - - NeutronNet - - NeutronPort - - NovaServer - - AbstractSubstitute - - ContrailAbstractSubstitute - - ContrailCompute - - ContrailNetworkRules - - ContrailPort - - ContrailV2NetworkRules - - ContrailV2VirtualMachineInterface - - ContrailV2VirtualNetwork - - ContrailVirtualNetwork - - VL ELINE - - SecurityRules - - VL -#Resource categories to keep (including all their subcategories) -resourceCategoriesNotToDelete: - - Generic - - Network L2-3 - - Network L4+ - - Application L4+ - - Network Connectivity - - DcaeComponent - -#Service categories to keep -serviceCategoriesNotToDelete: - - Mobility - - Network L1-3 - - Network L4+ - - VoIP Call Control -- cgit 1.2.3-korg