Skip to content

Commit

Permalink
changed to use Load Json string + renamed kw to applying devflags
Browse files Browse the repository at this point in the history
  • Loading branch information
@asanzgom
asanzgom committed Sep 24, 2024
1 parent df37b0a commit 54e611f
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
10 changes: 5 additions & 5 deletions ods_ci/tasks/Resources/RHODS_OLM/install/oc_install.robot
View file
Original file line number Diff line number Diff line change
Expand Up @@ -273,12 +273,12 @@ Wait For DSCInitialization CustomResource To Be Ready

Apply DataScienceCluster CustomResource
[Documentation]
[Arguments] ${dsc_name}=${DSC_NAME} ${custom}='False' ${custom_cmp}=''
[Arguments] ${dsc_name}=${DSC_NAME} ${custom}=False ${custom_cmp}=''

Check warning

Code scanning / Robocop

Keyword argument '{{ name }}' is not used Warning

Keyword argument '${custom_cmp}' is not used
${file_path} = Set Variable tasks/Resources/Files/
IF ${custom} == True

Check notice

Code scanning / Robocop

'{{ block_name }}' condition can be simplified Note

'IF' condition can be simplified
Log to Console message=Creating DataScience Cluster using custom configuration

Check warning

Code scanning / Robocop

Keyword name '{{ keyword_name }}' does not follow case convention Warning

Keyword name 'Log to Console' does not follow case convention
Create DataScienceCluster CustomResource Using Custom Configuration
Apply Custom Manifest in DataScienceCluster CustomResource Using Custom Configuration
Apply DevFlags in DataScienceCluster CustomResource

Check warning

Code scanning / Robocop

Keyword name '{{ keyword_name }}' does not follow case convention Warning

Keyword name 'Apply DevFlags in DataScienceCluster CustomResource' does not follow case convention
${yml} = Get File ${file_path}dsc_apply.yml
Log To Console Applying DSC yaml
Log To Console ${yml}
Expand Down Expand Up @@ -370,9 +370,9 @@ Apply Custom Manifest in DataScienceCluster CustomResource Using Test Variables
END
END

Apply Custom Manifest in DataScienceCluster CustomResource Using Custom Configuration
[Documentation] Apply custom manifests to a DSC file
Log To Console Applying Custom Manifests
Apply DevFlags in DataScienceCluster CustomResource

Check warning

Code scanning / Robocop

Keyword name '{{ keyword_name }}' does not follow case convention Warning

Keyword name 'Apply DevFlags in DataScienceCluster CustomResource' does not follow case convention
[Documentation] Apply devFlags to a DSC file
Log To Console Applying devFlags
${file_path} = Set Variable tasks/Resources/Files/
FOR ${cmp} IN @{COMPONENT_LIST}
Run sed -i'' -e "s|<${cmp}_devflags>||g" ${file_path}dsc_apply.yml
Expand Down
3 changes: 1 addition & 2 deletions ...0100__platform/0101__deploy/0104__operators/0104__rhods_operator/0110__service_mesh.robot
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,7 @@ Check Whether DSC Exists And Save Component Statuses
&{custom_cmp} = Create Dictionary

Check warning

Code scanning / Robocop

The assignment sign is not consistent within the file. Expected '{{ expected_sign }}' but got '{{ actual_sign }}' instead Warning test

The assignment sign is not consistent within the file. Expected '=' but got ' =' instead

Check warning

Code scanning / Robocop

Local variable '{{ name }}' is overwritten before usage Warning test

Local variable '${custom_cmp}' is overwritten before usage

Check notice

Code scanning / Robocop

{{ create_keyword }} can be replaced with VAR Note test

Create Dictionary can be replaced with VAR
${rc} ${out}= Run And Return Rc And Output
... oc get datasciencecluster ${DSC_NAME} -o jsonpath='{.spec.components}'
${custom_cmp}= evaluate json.loads('''${out}''') json
# Overwrite what is taken from test-variables
${custom_cmp}= Load Json String ${out}

Check notice

Code scanning / Robocop

Variable '{{ variable_name }}' may overwrite similar variable inside '{{ block_name }}' {{ block_type }}. Note that variables are case-insensitive, and also spaces and underscores are ignored. Note test

Variable '${custom_cmp}' may overwrite similar variable inside 'Check Whether DSC Exists And Save Component Statuses' Keyword. Note that variables are case-insensitive, and also spaces and underscores are ignored.
Set Test Variable ${custom_cmp} ${custom_cmp}

Check notice

Code scanning / Robocop

{{ set_variable_keyword }} can be replaced with VAR Note test

Set Test Variable can be replaced with VAR

Check warning

Code scanning / Robocop

Test, suite and global variables should be uppercase Warning test

Test, suite and global variables should be uppercase
ELSE

Check warning

Code scanning / Robocop

Trailing whitespace at the end of line Warning test

Trailing whitespace at the end of line
Set Global Variable ${DSC_EXISTS} False

Check notice

Code scanning / Robocop

{{ set_variable_keyword }} can be replaced with VAR Note test

Set Global Variable can be replaced with VAR
Expand Down

0 comments on commit 54e611f

Please sign in to comment.