diff options
| author |   JulienBe <julien.bertozzi@intl.att.com> | 2020-09-03 17:09:46 +0200 |
|---|---|---|
| committer |   Xue Gao <xg353y@intl.att.com> | 2020-09-07 12:18:23 +0000 |
| commit | 61663b92910868a4de51c6fe9a7cef7da96da7e9 (patch) | |
| tree | 86085699100a83f9de49375b635596601b55502d /test-apis-ci/sdc-api-tests/chef-repo/cookbooks | |
| parent | bcee4648917b2442f51a75639708bad4cd0fe4ad (diff) | |
Optimize Build
Optimize the log output
Issue-ID: SDC-3232
Signed-off-by: JulienBe <julien.bertozzi@intl.att.com>
Change-Id: I50cfb7119b1e9087d3e2db56a81fe47df4ad6254
Diffstat (limited to 'test-apis-ci/sdc-api-tests/chef-repo/cookbooks')
37 files changed, 0 insertions, 953 deletions
diff --git a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/attributes/default.rb b/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/attributes/default.rb deleted file mode 100644 index 4287ca8617..0000000000 --- a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/attributes/default.rb +++ /dev/null @@ -1 +0,0 @@ -#
\ No newline at end of file diff --git a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/PNFs/pmDictionary.yml b/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/PNFs/pmDictionary.yml deleted file mode 100644 index fa3ed531e7..0000000000 --- a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/PNFs/pmDictionary.yml +++ /dev/null @@ -1,98 +0,0 @@ ---- -# PM Dictionary Schema -pmMetaData: { presence: required, structure: { - pmHeader: { presence: required, structure: { - pmDefVsn: { presence: required, comment: “Version of the PM Dictionary artifact that contains this measurement. Vendor defined.”}, - pmDefSchemaVsn: { presence: required, comment: “PM Dictionary schema version from the VES Event Registration specification.”}, - nfType: { presence: required, comment: “NF type to whom this measurement applies. This should match the nfName-vendor string used in the fileReady or perf3gpp eventName.”} - } } , - pmFields: { presence: required, structure: { - measType: { presence: required, comment: “Measurement name used in PM file, in 3GPP format where specified, else vendor defined. Names for 3GPP-defined 4G measurements are specified in 3GPP TS 32.425 item e). Names for 3GPP-defined 5G measurements are specified in 3GPP TS 28.552 item e). Vendor defined names are preceded with VS.”}, - iMeasType: { presence: required, comment: “Vendor defined integer identifier for the measType, used for efficiency in GPB. Must be combined with measInfoId to identify a specific measurement.”}, - measDescription: { presence: required, comment: “Text description of the purpose of the measurement, what information does the measurement provide.”}, - measCondition: { presence: required, comment: “Text description of the condition that causes the measurement to be updated.”}, - measResultType: { presence: required, value: [integer], comment: “Data type of the measurement result.”}, - measResultRange: { presence: optional, comment: “Range of the measurement result. Only necessary when the range is smaller than the full range of the data type.”}, - measResultUnits: { presence: required, value: [seconds, minutes, nanoseconds, microseconds, dB, number, kilobytes, bytes, ethernetFrames, packets, users], comment: “Units of measure of the measurement result.”}, - measObjClass: { presence: required, comment: “Object class of the measurement.”}, - measCollectionMethod: { presence: required, value: [CC, SI, DER, Gauge, Average], comment: “Measurement collection method of the measurement. CC, SI, DER and Gauge are as defined in 3GPP. Average contains the average value of the measurement during the granularity period.”}, - measLastChange: { presence: required, comment: “Version of the PM Dictionary artifact the last time this measurement was added, modified or deleted.”}, - measChangeType: { presence: required, value: [added, modified, deleted], comment: “Indicates the type of change that occurred during the measLastChange.”}, - measInfoId: { presence: required, comment: “Name for a group of related measurements, in 3GPP format where specified, else vendor defined. Family names for 3GPP-defined 4G measurements are specified in 3GPP TS 32.425 Section 3.1. Family names for 3GPP-defined 5G measurements are specified in 3GPP TS 28.552 Section 3.4.”}, - iMeasInfoId: { presence: required, comment: “Vendor defined integer identifier for the measInfoId, used for efficiency in GPB.”}, - measFamily: { presence: required, comment: “Abbreviation for a family of measurements, in 3GPP format where specified, else vendor defined.”}, - measAdditionalFields: { presence: required, comment: “This section contains vendor specific measurement fields.”, structure: { - measAggregationLevels: { presence: required, value: [NRBTS, NRCellCU, NRCellDU, IPNO, IPSEC, ETHIF], comment: “A list of one or more aggregations levels that Nokia recommends for this measurement. For example, if the value is NRBTS NRCellCU, then Nokia recommends that this measurement be aggregated on the 5G BTS level and the 5G CU Cell level.”}, - measTriggerType: { presence: optional, value: [Event, Sample], comment: “Indicates whether this measurement is triggered by an event or is sampled.”} - } } - } } -} } ---- -pmMetaData: - pmHeader: - nfType: gnb-Nokia - pmDefSchemaVsn: 2.0 - pmDefVsn: 5G19_1906_002 - pmFields: - iMeasInfoId: 2204 - iMeasType: 1 - measCollectionMethod: CC - measCondition: "This measurement is updated when X2AP: SgNB Modification Required message is sent to MeNB with the SCG Change Indication set as PSCellChange." - measDescription: "This counter indicates the number of intra gNB intra frequency PSCell change attempts." - measFamily: NINFC - measInfoId: "NR Intra Frequency PSCell Change" - measLastChange: 5G18A_1807_003 - measObjClass: NGCELL - measResultRange: 0-4096 - measResultType: integer - measResultUnits: number - measType: VS.NINFC.IntraFrPscelChAttempt - measAdditionalFields: - vendorField1: X - vendorField2: B ---- -pmMetaData: - pmHeader: - nfType: gnb-Nokia - pmDefSchemaVsn: 2.0 - pmDefVsn: 5G19_1906_002 - pmFields: - iMeasInfoId: 2204 - iMeasType: 2 - measCollectionMethod: CC - measCondition: "This measurement is updated when the TDCoverall timer has elapsed before gNB receives the X2AP: SgNB Modification Confirm message." - measDescription: "This measurement the number of intra gNB intra frequency PSCell change failures due to TDCoverall timer expiry." - measFamily: NINFC - measInfoId: "NR Intra Frequency PSCell Change" - measLastChange: 5G18A_1807_003 - measObjClass: NGCELL - measResultRange: 0-4096 - measResultType: integer - measResultUnits: number - measType: VS.NINFC.IntraFrPscelChFailTdcExp - measAdditionalFields: - vendorField1: Y ---- -pmMetaData: - pmHeader: - nfType: gnb-Nokia - pmDefSchemaVsn: 2.0 - pmDefVsn: 5G19_1906_002 - pmFields: - iMeasInfoId: 2206 - iMeasType: 1 - measCollectionMethod: CC - measCondition: "This measurement is updated when MeNB replies to X2AP: SgNB Modification Required message with the X2AP: SgNB Modification Refuse message." - measDescription: "This counter indicates the number of intra gNB intra frequency PSCell change failures due to MeNB refusal." - measFamily: NINFC - measInfoId: "NR Intra Frequency PSCell Change" - measLastChange: 5G19_1906_002 - measObjClass: NGCELL - measResultRange: 0-4096 - measResultType: integer - measResultUnits: number - measType: VS.NINFC.IntraFrPscelChFailMenbRef - measAdditionalFields: - vendorField1: Z - vendorField2: A -... diff --git a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/PNFs/sample-pnf-1.0.1-SNAPSHOT.csar b/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/PNFs/sample-pnf-1.0.1-SNAPSHOT.csar Binary files differdeleted file mode 100644 index b4d2b3eda3..0000000000 --- a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/PNFs/sample-pnf-1.0.1-SNAPSHOT.csar +++ /dev/null diff --git a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/PNFs/sample-pnf-custom-type.csar b/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/PNFs/sample-pnf-custom-type.csar Binary files differdeleted file mode 100644 index e4e60b26d1..0000000000 --- a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/PNFs/sample-pnf-custom-type.csar +++ /dev/null diff --git a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/PNFs/sample-signed-pnf-1.0.1-SNAPSHOT.zip b/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/PNFs/sample-signed-pnf-1.0.1-SNAPSHOT.zip Binary files differdeleted file mode 100644 index fecb45aaaf..0000000000 --- a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/PNFs/sample-signed-pnf-1.0.1-SNAPSHOT.zip +++ /dev/null diff --git a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/PNFs/sample-signed-pnf-cms-includes-cert-1.0.1-SNAPSHOT.zip b/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/PNFs/sample-signed-pnf-cms-includes-cert-1.0.1-SNAPSHOT.zip Binary files differdeleted file mode 100644 index 676a9ff777..0000000000 --- a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/PNFs/sample-signed-pnf-cms-includes-cert-1.0.1-SNAPSHOT.zip +++ /dev/null diff --git a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/VNFs/Huawei_vHSS.csar b/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/VNFs/Huawei_vHSS.csar Binary files differdeleted file mode 100644 index 316d5690f5..0000000000 --- a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/VNFs/Huawei_vHSS.csar +++ /dev/null diff --git a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/VNFs/Huawei_vMME.csar b/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/VNFs/Huawei_vMME.csar Binary files differdeleted file mode 100644 index fe313fff86..0000000000 --- a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/VNFs/Huawei_vMME.csar +++ /dev/null diff --git a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/VNFs/ZteEpcMmeVf.csar b/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/VNFs/ZteEpcMmeVf.csar Binary files differdeleted file mode 100644 index 184c223ec2..0000000000 --- a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/VNFs/ZteEpcMmeVf.csar +++ /dev/null diff --git a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/VNFs/base_vfw.zip b/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/VNFs/base_vfw.zip Binary files differdeleted file mode 100644 index b8273defea..0000000000 --- a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/VNFs/base_vfw.zip +++ /dev/null diff --git a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/VNFs/base_vvg.zip b/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/VNFs/base_vvg.zip Binary files differdeleted file mode 100644 index dc9ef5d823..0000000000 --- a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/VNFs/base_vvg.zip +++ /dev/null diff --git a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/VNFs/database-substitution-mappings.csar b/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/VNFs/database-substitution-mappings.csar Binary files differdeleted file mode 100644 index 6fbf240977..0000000000 --- a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/VNFs/database-substitution-mappings.csar +++ /dev/null diff --git a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/VNFs/infra.zip b/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/VNFs/infra.zip Binary files differdeleted file mode 100644 index 09eb9cd648..0000000000 --- a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/VNFs/infra.zip +++ /dev/null diff --git a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/VNFs/resource-ZteEpcMmeVf-csar_fix.csar b/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/VNFs/resource-ZteEpcMmeVf-csar_fix.csar Binary files differdeleted file mode 100644 index 72d3d0c869..0000000000 --- a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/VNFs/resource-ZteEpcMmeVf-csar_fix.csar +++ /dev/null diff --git a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/VNFs/vLB.zip b/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/VNFs/vLB.zip Binary files differdeleted file mode 100644 index b61ca1b83b..0000000000 --- a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/VNFs/vLB.zip +++ /dev/null diff --git a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/VNFs/vLBMS.zip b/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/VNFs/vLBMS.zip Binary files differdeleted file mode 100644 index c542870bad..0000000000 --- a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/VNFs/vLBMS.zip +++ /dev/null diff --git a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/VNFs/vSBC_update_v03.csar b/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/VNFs/vSBC_update_v03.csar Binary files differdeleted file mode 100644 index 65d66cd693..0000000000 --- a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/VNFs/vSBC_update_v03.csar +++ /dev/null diff --git a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/VNFs/vbng.zip b/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/VNFs/vbng.zip Binary files differdeleted file mode 100644 index ab5163d9ed..0000000000 --- a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/VNFs/vbng.zip +++ /dev/null diff --git a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/VNFs/vbrgemu.zip b/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/VNFs/vbrgemu.zip Binary files differdeleted file mode 100644 index 28c69a570f..0000000000 --- a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/VNFs/vbrgemu.zip +++ /dev/null diff --git a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/VNFs/vesEvent.yml b/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/VNFs/vesEvent.yml deleted file mode 100644 index ce6a152154..0000000000 --- a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/VNFs/vesEvent.yml +++ /dev/null @@ -1,282 +0,0 @@ ---- -event: { - presence: required, - action: [ any, any, baseStationSynchronizationProblem, - contact technical support ], - structure: { - commonEventHeader: { - presence: required, - structure: { - domain: { - presence: required, - value: fault - }, - eventName: { - presence: required, - value: 'Fault_1' - }, - eventId: { - presence: required - }, - nfNamingCode: { - value: mrfx - }, - priority: { - presence: required, - value: 'Medium' - }, - reportingEntityId: { - presence: required - }, - reportingEntityName: { - presence: required - }, - sequence: { - presence: required - }, - sourceId: { - presence: required - }, - sourceName: { - presence: required - }, - startEpochMicrosec: { - presence: required - }, - lastEpochMicrosec: { - presence: required - }, - version: { - presence: required, - value: 3.0 - } - } - }, - faultFields: { - presence: required, - structure: { - eventCategory: { - presence: optional, - comment: 'Equipment Alarm' - }, - alarmCondition: { - presence: required, - value: alarm003 - }, - eventSeverity: { - presence: required, - value: MAJOR - }, - eventSourceType: { - presence: required, - value: virtualNetworkFunction - }, - faultFieldsVersion: { - presence: required, - value: 2.0 - }, - specificProblem: { - presence: required, - value: "Configuration file was corrupt or not present" - }, - vfStatus: { - presence: required, - value: "Requesting Termination" - }, - alarmAdditionalInformation: { - required: true, - comment: "Comment" - } - } - } - }, - comment: "comment2" -} - ---- - -event: { - presence: required, - action: [ any, any, baseStationConnectivityLost, - contact technical support ], - structure: { - commonEventHeader: { - presence: required, - structure: { - domain: { - presence: required, - value: fault - }, - eventName: { - presence: required, - value: 'Fault_2' - }, - eventId: { - presence: required - }, - nfNamingCode: { - value: mrfx - }, - priority: { - presence: required, - value: 'Medium' - }, - reportingEntityId: { - presence: required - }, - reportingEntityName: { - presence: required - }, - sequence: { - presence: required - }, - sourceId: { - presence: required - }, - sourceName: { - presence: required - }, - startEpochMicrosec: { - presence: required - }, - lastEpochMicrosec: { - presence: required - }, - version: { - presence: required, - value: 3.0 - } - } - }, - faultFields: { - presence: required, - structure: { - eventCategory: { - presence: optional, - comment: 'Communications Alarm' - }, - alarmCondition: { - presence: required, - value: 'baseStationConnectivityLost' - }, - eventSeverity: { - presence: required - }, - eventSourceType: { - presence: required, - value: 'virtualNetworkFunction' - }, - faultFieldsVersion: { - presence: required, - value: 2.0 - }, - specificProblem: { - presence: required - }, - vfStatus: { - presence: required, - value: "Active" - }, - alarmAdditionalInformation: { - required: true, - comment: "comment' - " - } - } - } - }, - comment: "comment2 - ", -} - ---- -event: { - presence: required, - action: [ any, any, baseStationSoftwareManagementProblem, - contact technical support ], - structure: { - commonEventHeader: { - presence: required, - structure: { - domain: { - presence: required, - value: fault - }, - eventName: { - presence: required, - value: 'Fault_3' - }, - eventId: { - presence: required - }, - nfNamingCode: { - value: mrfx - }, - priority: { - presence: required, - value: 'Medium' - }, - reportingEntityId: { - presence: required - }, - reportingEntityName: { - presence: required - }, - sequence: { - presence: required - }, - sourceId: { - presence: required - }, - sourceName: { - presence: required - }, - startEpochMicrosec: { - presence: required - }, - lastEpochMicrosec: { - presence: required - }, - version: { - presence: required, - value: 3.0 - } - } - }, - faultFields: { - presence: required, - structure: { - eventCategory: { - presence: optional, - comment: 'Processing Error' - }, - alarmCondition: { - presence: required, - value: 'baseStationsoftwareManagementProblem' - }, - eventSeverity: { - presence: required - }, - eventSourceType: { - presence: required - }, - faultFieldsVersion: { - presence: required, - value: 3.0 - }, - specificProblem: { - presence: required - }, - vfStatus: { - presence: required, - value: "Active" - }, - alarmAdditionalInformation: { - required: true, - comment: "comment" - } - } - } - }, - comment: "comment2" -}
\ No newline at end of file diff --git a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/VNFs/vfw.zip b/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/VNFs/vfw.zip Binary files differdeleted file mode 100644 index b8273defea..0000000000 --- a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/VNFs/vfw.zip +++ /dev/null diff --git a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/VNFs/vgmux.zip b/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/VNFs/vgmux.zip Binary files differdeleted file mode 100644 index 56de952150..0000000000 --- a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/VNFs/vgmux.zip +++ /dev/null diff --git a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/VNFs/vgw.zip b/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/VNFs/vgw.zip Binary files differdeleted file mode 100644 index 7a14718c2c..0000000000 --- a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/VNFs/vgw.zip +++ /dev/null diff --git a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/VNFs/vsp-vgw.csar b/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/VNFs/vsp-vgw.csar Binary files differdeleted file mode 100644 index 316d5690f5..0000000000 --- a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/VNFs/vsp-vgw.csar +++ /dev/null diff --git a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/VNFs/vvg.zip b/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/VNFs/vvg.zip Binary files differdeleted file mode 100644 index dc9ef5d823..0000000000 --- a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/VNFs/vvg.zip +++ /dev/null diff --git a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/cert/root.cert b/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/cert/root.cert deleted file mode 100644 index 11c827ac6f..0000000000 --- a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/cert/root.cert +++ /dev/null @@ -1,23 +0,0 @@ ------BEGIN CERTIFICATE----- -MIID3zCCAsegAwIBAgIUQ7qc+oRcxS9++2Vd+ufBuSRzITkwDQYJKoZIhvcNAQEL -BQAwfzELMAkGA1UEBhMCSVIxDTALBgNVBAgMBE9OQVAxDDAKBgNVBAcMA1NEQzER -MA8GA1UECgwIT05BUC1TREMxGDAWBgNVBAMMD29yZy5vbmFwLnNkYy5jYTEmMCQG -CSqGSIb3DQEJARYXb25hcC1zZGNAbGlzdHMub25hcC5vcmcwHhcNMTkxMDI5MTE0 -MzU3WhcNMzkxMDI0MTE0MzU3WjB/MQswCQYDVQQGEwJJUjENMAsGA1UECAwET05B -UDEMMAoGA1UEBwwDU0RDMREwDwYDVQQKDAhPTkFQLVNEQzEYMBYGA1UEAwwPb3Jn -Lm9uYXAuc2RjLmNhMSYwJAYJKoZIhvcNAQkBFhdvbmFwLXNkY0BsaXN0cy5vbmFw -Lm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANkzC40LeZGiN07u -Sy3crOkJBwulOIXHyWfWbiTbdgd0SebPccYRke3W4IQok/X/j1pNJtgdHHVcqznn -wVLcDoHjfy+wIX5EBv4zCDMAXDJ+NQE0HXOCiGGReUXVmnrZDDx30D0wgtZyvZlB -ziMhshjhVsX2OlJL4Dr33ztLnNq8NvCxsTqCVoL4N5ax7Vfi8v9JQOPletdxRfpS -UOECdpOzua+6DxWsglqKbWb0F9SWfnYRgKEqqotLDHGPKSIK9nduMLTpihqdukTN -Ud68Jp+TvhpIX47VTW5J0n9rYvjh7pTzICKjEygWcQBIUIuAsg8e9JQoyzbPV0mp -nQL4DwMCAwEAAaNTMFEwHQYDVR0OBBYEFLEM1nLbWBpDorCskxldxIXY3u2rMB8G -A1UdIwQYMBaAFLEM1nLbWBpDorCskxldxIXY3u2rMA8GA1UdEwEB/wQFMAMBAf8w -DQYJKoZIhvcNAQELBQADggEBADkYWsK8mayXAmMWll7A2VY7PIBSsoqiPAN/Vr5Y -BUD0wnAI55CN38iD6Yg1q5u380oc7OsbonwwVE1iIgf1ptg9GOMoNqGFPXGSqobE -JfYiFBCeXZHjbv9ZpF8/YnI2iqMV0dQGJ27uOYkFPv41HYLBYrtw+oULpcU+Bd18 -lK7JVvyKj7vn9oFZn880Jdrcm+u0FD35usCO090a1hXnmAftaBRqXK2F0fttit5n -yu4UU9oc/e0Z24ScXBcYRorEYc7U88D6oRTz8zPp1LIcTqxIsJigbNRTGArTJLLW -pvB8br2xl31PJ3KFTswpT8SzJN8OnuCID6Cuc4QcEzbYU7U= ------END CERTIFICATE----- diff --git a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/conf/attsdc-packages.yaml b/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/conf/attsdc-packages.yaml deleted file mode 100644 index 5d1a3e1537..0000000000 --- a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/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/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/conf/credentials.yaml b/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/conf/credentials.yaml deleted file mode 100644 index 05f9a71c5c..0000000000 --- a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/conf/credentials.yaml +++ /dev/null @@ -1,48 +0,0 @@ - designer: { - username: cs0008, - password: 123123a, - firstname: SDC, - lastname: SDC2 - } - admin: { - username: jh0003, - password: 123123a, - firstname: SDC, - lastname: SDC2 - } - ops: { - username: op0001, - password: 123123a, - firstname: SDC, - lastname: SDC2 - } - tester: { - username: jm0007, - password: 123123a, - firstname: SDC, - lastname: SDC2 - } - governor: { - username: gv0001, - password: 123123a, - firstname: SDC, - lastname: SDC2 - } - product_strategist: { - username: m99126, - password: 123123a, - firstname: SDC, - lastname: SDC2 - } - product_manager: { - username: m99127, - password: 123123a, - firstname: SDC, - lastname: SDC2 - } - product_local: { - username: pm0001, - password: 123123a, - firstname: SDC, - lastname: SDC2 - }
\ No newline at end of file diff --git a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/conf/log4j2.properties b/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/conf/log4j2.properties deleted file mode 100644 index ec22601d6a..0000000000 --- a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/conf/log4j2.properties +++ /dev/null @@ -1,49 +0,0 @@ -status = error -dest = err -name = PropertiesConfig - -property.filename = ${targetlog}logs/ci-log.out - -#filter.threshold.type = ThresholdFilter -#filter.threshold.level = debug - -appender.rolling.type = RollingFile -appender.rolling.name = RollingFile -appender.rolling.fileName = ${filename} -appender.rolling.filePattern = ${targetlog}logs/ci-%d{MM-dd-yy-HH-mm-ss}-%i.log.gz -appender.rolling.layout.type = PatternLayout -appender.rolling.layout.pattern = %d{yyyy-MM-dd HH:mm:ss} %5p [%10c] : %m%n -appender.rolling.policies.type = Policies -appender.rolling.policies.size.type = SizeBasedTriggeringPolicy -appender.rolling.policies.size.size=5MB -appender.rolling.strategy.type = DefaultRolloverStrategy -appender.rolling.strategy.max = 10 - -appender.console.type = Console -appender.console.name = STDOUT -appender.console.layout.type = PatternLayout -appender.console.layout.pattern = %d{yyyy-MM-dd HH:mm:ss} %5p %10c:%L - %m%n -appender.console.filter.threshold.type = ThresholdFilter -appender.console.filter.threshold.level = info - -loggers=org.apache.cassandra.service.StorageProxy,org.janusgraph.diskstorage.cassandra.CassandraTransaction,org.openecomp.sdc.ci.tests.utils - -logger.org.apache.cassandra.service.StorageProxy.name = org.apache.cassandra.service.StorageProxy -logger.org.apache.cassandra.service.StorageProxy.level=info -logger.org.apache.cassandra.service.StorageProxy.appendRef.rolling.ref = RollingFile -logger.org.apache.cassandra.service.StorageProxy.appendRef.stdout.ref = STDOUT - -logger.org.janusgraph.diskstorage.cassandra.CassandraTransaction.name = org.janusgraph.diskstorage.cassandra.CassandraTransaction -logger.org.janusgraph.diskstorage.cassandra.CassandraTransaction.level =info -logger.org.janusgraph.diskstorage.cassandra.CassandraTransaction.appendRef.rolling.ref = RollingFile -logger.org.janusgraph.diskstorage.cassandra.CassandraTransaction.appendRef.stdout.ref = STDOUT - -logger.org.openecomp.sdc.ci.tests.utils.name = org.openecomp.sdc.ci.tests.utils -logger.org.openecomp.sdc.ci.tests.utils.level = info -logger.org.openecomp.sdc.ci.tests.utils.appendRef.rolling.ref = RollingFile -logger.org.openecomp.sdc.ci.tests.utils.appendRef.stdout.ref = STDOUT -logger.org.openecomp.sdc.ci.tests.utils.additivity = false - -rootLogger.level = info -rootLogger.appenderRef.stdout.ref = STDOUT -rootLogger.appenderRef.rolling.ref = RollingFile
\ No newline at end of file diff --git a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/conf/logback.xml b/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/conf/logback.xml deleted file mode 100644 index b41ee12695..0000000000 --- a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/conf/logback.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<configuration scan="true" scanPeriod="5 seconds"> - - <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> - <encoder> - <pattern>%d{yyyy-MM-dd HH:mm:ss} | %-5p | [%thread] %logger{5}:%L - %msg%n</pattern> - </encoder> - </appender> - - <appender name="FILE" class="ch.qos.logback.core.FileAppender"> - <file>logFile.log</file> - <append>true</append> - <encoder> - <pattern>%d{yyyy-MM-dd HH:mm:ss} | %-5p | [%thread] %logger{5}:%L - %msg%n</pattern> - </encoder> - </appender> - - <logger name="com.memorynotfound" level="INFO"/> - - <root level="INFO"> - <appender-ref ref="STDOUT" /> - <appender-ref ref="FILE" /> - </root> - -</configuration>
\ No newline at end of file diff --git a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/org.onap.sdc.trust.jks b/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/org.onap.sdc.trust.jks Binary files differdeleted file mode 100644 index e6686cc08c..0000000000 --- a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/org.onap.sdc.trust.jks +++ /dev/null diff --git a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/startTest.sh b/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/startTest.sh deleted file mode 100644 index 32f927ddb0..0000000000 --- a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/startTest.sh +++ /dev/null @@ -1,157 +0,0 @@ -#!/bin/bash -REMOTE_DEBUG=false -RERUN=false -debug_port=8000 -TEST_SUITES=testSuites -fileName=testng-failed.xml -JAVA_OPTIONS="${JAVA_OPTIONS} \ - -Djavax.net.ssl.trustStore=/var/lib/tests/etc/org.onap.sdc.trust.jks \ - -Dtestng.show.stack.frames=true \ - " - -function help_usage () -{ - echo - echo "$0 (<jar_file_name> <suite file name>) [-r/rerun <true/false> -d/debug <true/false>]" - 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 '/<test name="'${PATTERN}'"/,/<!-- '${PATTERN}' --/d' $1 > ${FULL_PATH}/${TEST_SUITES}/${fileName} - sed -i 's/thread-count="[0-9]\+"/thread-count="1"/g' ${FULL_PATH}/${TEST_SUITES}/${fileName} - if [ -s "ExtentReport/ShortReport.csv" ] - then - SKIP_TESTS_LIST=$(cat ExtentReport/ShortReport.csv |awk -F, '{print $2}' | sed 's/&.*//g' | uniq) - for SKIP_TEST in ${SKIP_TESTS_LIST}; do - sed -i "s/.*\"${SKIP_TEST}\".*//g" ${FULL_PATH}/${TEST_SUITES}/${fileName}; - done; - fi -} - -function setUpdatedTimeToReport () -{ - LINE_NUMBER_OF_START_REPORT_DATE=`grep -A1 -nw "Start" ExtentReport/SDC_UI_Extent_Report.html | tail -1 | awk '{print $1}' | tr -d -` - END_REPORT_DATE=`grep -A1 -nw "End" ExtentReport/SDC_UI_Extent_Report.html | tail -1 | awk -F'[>|<]' '{print $3}'` - EPOCH_START_REPORT_DATE=`date --date="${1}" +%s` - EPOCH_END_REPORT_DATE=`date --date="${END_REPORT_DATE}" +%s` - let DIFF_EPOCH_TIME=${EPOCH_END_REPORT_DATE}-${EPOCH_START_REPORT_DATE} - TAKEN_TIME_IN_MINUTES=`echo $((${DIFF_EPOCH_TIME}/60))` - LINE_NUMBER_OF_TAKEN_REPORT_TIME=`grep -A1 -nw "Time Taken" ExtentReport/SDC_UI_Extent_Report.html | tail -1 | awk '{print $1}' | tr -d -` - PATTERN="div class='panel-lead'>"; - sed -i "${LINE_NUMBER_OF_START_REPORT_DATE}s/${PATTERN}.*\</${PATTERN}$1\<\//1" ExtentReport/SDC_UI_Extent_Report.html - sed -i "${LINE_NUMBER_OF_TAKEN_REPORT_TIME}s/${PATTERN}.*\</${PATTERN}${TAKEN_TIME_IN_MINUTES} min\<\//1" ExtentReport/SDC_UI_Extent_Report.html -} - -#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=conf/log4j2.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_OPTIONS -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_OPTIONS -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 diff --git a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/recipes/sanityApiTests_1_setup_env.rb b/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/recipes/sanityApiTests_1_setup_env.rb deleted file mode 100644 index 61d0133888..0000000000 --- a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/recipes/sanityApiTests_1_setup_env.rb +++ /dev/null @@ -1,64 +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 - - directory "create_etc_dir" do - path "/var/lib/tests/etc" - owner 'root' - group 'root' - mode '0755' - action :create - end - -cookbook_file "/var/lib/tests/etc/org.onap.sdc.trust.jks" do - source "org.onap.sdc.trust.jks" - owner "root" - group "root" - mode 0644 -end
\ No newline at end of file diff --git a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/recipes/sanityApiTests_2_setup_configuration.rb b/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/recipes/sanityApiTests_2_setup_configuration.rb deleted file mode 100644 index c47d1dc95c..0000000000 --- a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/recipes/sanityApiTests_2_setup_configuration.rb +++ /dev/null @@ -1,53 +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_host => node['Nodes']['BE'], - :catalogBE_port => node['BE'][:http_port], - :webportal_host => node['Nodes']['FE'], - :webportal_port => node['FE'][:http_port], - :janusgraph_file => "#{tests_base}/conf/janusgraph.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'][0], - :CASSANDRA_PORT => node['cassandra'][:cassandra_port], - :CASSANDRA_PWD => node['cassandra'][:cassandra_password], - :CASSANDRA_USR => node['cassandra'][:cassandra_user] - }) -end - -template "janusgraph.properties" do - path "/#{tests_base}/conf/janusgraph.properties" - source "BE-janusgraph.properties.erb" - owner "root" - group "root" - mode "0755" - variables({ - :CASSANDRA_IP => node['Nodes']['CS'].join(",").gsub(/[|]/,''), - :CASSANDRA_PORT => node['cassandra'][:cassandra_port], - :CASSANDRA_PWD => node['cassandra'][:cassandra_password], - :CASSANDRA_USR => node['cassandra'][:cassandra_user], - :rep_factor => node['cassandra']['replication_factor'], - :DC_NAME => node['cassandra']['datacenter_name'] - }) -end - -bash "Make root cert file available" do -cwd "#{tests_base}" -code <<-EOH - cp /root/chef-solo/cookbooks/sdc-api-tests/files/default/cert/root.cert /var/lib/tests/cert/root.cert - echo "root.cert file made available for tests." -EOH -end - diff --git a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/recipes/sanityApiTests_3_sanity_execution.rb b/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/recipes/sanityApiTests_3_sanity_execution.rb deleted file mode 100644 index 4e6a5e19f6..0000000000 --- a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/recipes/sanityApiTests_3_sanity_execution.rb +++ /dev/null @@ -1,19 +0,0 @@ -tests_base="/var/lib/tests" -ci_test_suite="#{ENV['SUITE_NAME']}.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/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/templates/default/BE-janusgraph.properties.erb b/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/templates/default/BE-janusgraph.properties.erb deleted file mode 100644 index d333242710..0000000000 --- a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/templates/default/BE-janusgraph.properties.erb +++ /dev/null @@ -1,24 +0,0 @@ -storage.backend=cql -storage.hostname=<%= @CASSANDRA_IP %> -storage.port=<%= @CASSANDRA_PORT %> -storage.username=<%= @CASSANDRA_USR %> -storage.password=<%= @CASSANDRA_PWD %> -storage.connection-timeout=10000 -storage.cql.keyspace=sdctitan - -storage.cql.ssl.enabled=false -storage.cql.ssl.truststore.location=/var/lib/jetty/config/.truststore -storage.cql.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.cql.read-consistency-level=LOCAL_QUORUM -storage.cql.write-consistency-level=LOCAL_QUORUM -storage.cql.replication-strategy-class=NetworkTopologyStrategy -storage.cql.replication-strategy-options=<%= @DC_NAME %>,<%= @rep_factor %> - -storage.lock.retries=5 -storage.lock.wait-time=500 diff --git a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/templates/default/sdc-sanity.yaml.erb b/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/templates/default/sdc-sanity.yaml.erb deleted file mode 100644 index 4185e3fee9..0000000000 --- a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/templates/default/sdc-sanity.yaml.erb +++ /dev/null @@ -1,98 +0,0 @@ -outputFolder: <%= @target_path %> -reportName: index.html -esHost: eshost -disributionClientHost: disClient -<% if node[:disableHttp] -%> -sdcHttpMethod: https -onboardingBePort: <%= node['ONBOARDING_BE'][:https_port] %> -onboardingBeHost: <%= node['ONBOARDING_BE'][:domain_name] %> -catalogBeHost: <%= node['BE'][:domain_name] %> -catalogBePort: <%= node['BE'][:https_port] %> -catalogFeHost: <%= node['FE'][:domain_name] %> -catalogFePort: <%= node['FE'][:https_port] %> -<% else %> -sdcHttpMethod: http -onboardingBePort: <%= node['ONBOARDING_BE'][:http_port] %> -onboardingBeHost: <%= node['ONBOARDING_BE_VIP'] %> -catalogFeHost: <%= @webportal_host %> -catalogFePort: <%= @webportal_port %> -catalogBeHost: <%= @catalogBE_host %> -catalogBePort: <%= @catalogBE_port %> -<% end -%> -disributionClientPort: 8181 -esPort: 9200 - - -resourceConfigDir: <%= @tests_path_ci %> -componentsConfigDir: <%= @components_path %> -importResourceConfigDir: <%= @importResourceConfigDir %> -importResourceTestsConfigDir: <%= @importResourceTestsConfigDir %> -errorConfigurationFile: <%= @errorConfigurationFile %> -configurationFile: <%= @ConfigurationFile %> -importTypesConfigDir: <%= @importTypesDir %> -janusGraphPropertiesFile: <%= @janusgraph_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 - -localDataCenter: DC-Automate01 - -stopOnClassFailure: false - -#List of non-abstract resources to keep during JanusGraph 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 |