Skip to content

Commit

Permalink
fix validateStudies.py path
Browse files Browse the repository at this point in the history
  • Loading branch information
inodb committed Feb 29, 2024
1 parent 90288fb commit 8d2002f
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .circleci/validate_all_studies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ git lfs pull -I "public"
num_studies=${#list_of_study_dirs[@]}

test_reports_location="$HOME/test-reports"
validation_command="$HOME/cbioportal/core/src/main/scripts/importer/./validateStudies.py -d $HOME/repo/public/ -p $HOME/repo/.circleci/portalinfo -html $test_reports_location"
validation_command="$HOME/cbioportal-core/src/main/resources/resources/scripts/importer/./validateStudies.py -d $HOME/repo/public/ -p $HOME/repo/.circleci/portalinfo -html $test_reports_location"
echo $'\nExecuting: '; echo $validation_command
if sh -c "$validation_command" ; then
echo "Tests passed successfully"
Expand Down
6 changes: 3 additions & 3 deletions .circleci/validate_changed_studies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,13 @@ if [[ $num_studies > 0 ]]; then
# fi
# append the first study
if [ "$validation_command" = "" ] ; then
validation_command="($HOME/cbioportal-core/src/main/scripts/importer/./validateStudies.py -d $HOME/repo/ -l $study -p $HOME/repo/.circleci/portalinfo -html $test_reports_location/$study"
validation_command="($HOME/cbioportal-core/src/main/resources/resources/resources/scripts/importer/./validateStudies.py -d $HOME/repo/ -l $study -p $HOME/repo/.circleci/portalinfo -html $test_reports_location/$study"
else
# run each validation individually in the background
if [ $mod = 0 ] ; then
validation_command="${validation_command}) & ($HOME/cbioportal-core/src/main/scripts/importer/./validateStudies.py -d $HOME/repo/ -l $study -p $HOME/repo/.circleci/portalinfo -html $test_reports_location/$study"
validation_command="${validation_command}) & ($HOME/cbioportal-core/src/main/resources/resources/resources/scripts/importer/./validateStudies.py -d $HOME/repo/ -l $study -p $HOME/repo/.circleci/portalinfo -html $test_reports_location/$study"
else
validation_command="${validation_command} ; $HOME/cbioportal-core/src/main/scripts/importer/./validateStudies.py -d $HOME/repo/ -l $study -p $HOME/repo/.circleci/portalinfo -html $test_reports_location/$study"
validation_command="${validation_command} ; $HOME/cbioportal-core/src/main/resources/resources/resources/scripts/importer/./validateStudies.py -d $HOME/repo/ -l $study -p $HOME/repo/.circleci/portalinfo -html $test_reports_location/$study"
fi
fi
done
Expand Down

1 comment on commit 8d2002f

@inodb
Copy link
Member Author

@inodb inodb commented on 8d2002f Feb 29, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Related to: #2013

Please sign in to comment.