mirror of
https://github.com/deepset-ai/haystack.git
synced 2026-01-03 18:48:27 +00:00
Restart containers in tutorials.sh (#2858)
* restart tutorials in the loop * remove container steps in tutorials.yml * forgotten quotes * unmatched bracket * give names to containers * try to limit the log size * make the containers restart on the scripts as well * feedback * Raise integration tests timeout * raising limit again
This commit is contained in:
parent
7dcef68685
commit
5d8476eb58
33
.github/utils/tutorials.sh
vendored
33
.github/utils/tutorials.sh
vendored
@ -7,10 +7,13 @@ python_path=$1
|
||||
files_changed=$2
|
||||
exclusion_list=$3
|
||||
make_python_path_editable=$4
|
||||
containers_policy=$5
|
||||
no_got_tutorials='4_FAQ_style_QA 5_Evaluation 7_RAG_Generator 8_Preprocessing 10_Knowledge_Graph 15_TableQA 16_Document_Classifier_at_Index_Time'
|
||||
|
||||
echo "Files changed in this PR: $files_changed"
|
||||
echo "Excluding: $exclusion_list"
|
||||
echo "Python path is editable: $make_python_path_editable"
|
||||
echo "Containers policy: $containers_policy"
|
||||
|
||||
# Collect the tutorials to run
|
||||
scripts_to_run=""
|
||||
@ -33,9 +36,15 @@ for script in $files_changed; do
|
||||
scripts_to_run="$scripts_to_run $script"
|
||||
done
|
||||
|
||||
|
||||
# Run the containers
|
||||
docker run -d -p 9200:9200 --name elasticsearch -e "discovery.type=single-node" -e "ES_JAVA_OPTS=-Xms128m -Xmx256m" elasticsearch:7.9.2
|
||||
docker run -d -p 9998:9998 --name tika -e "TIKA_CHILD_JAVA_OPTS=-JXms128m" -e "TIKA_CHILD_JAVA_OPTS=-JXmx128m" apache/tika:1.24.1
|
||||
|
||||
|
||||
failed=""
|
||||
for script in $scripts_to_run; do
|
||||
|
||||
|
||||
echo ""
|
||||
echo "##################################################################################"
|
||||
echo "##################################################################################"
|
||||
@ -73,15 +82,31 @@ for script in $scripts_to_run; do
|
||||
fi
|
||||
|
||||
if [[ "$script" == *".py" ]]; then
|
||||
time python $script
|
||||
output=$(time python $script)
|
||||
else
|
||||
sudo $python_path/bin/ipython -c "%run $script"
|
||||
output=$(sudo $python_path/bin/ipython -c "%run $script")
|
||||
fi
|
||||
|
||||
if [ ! $? -eq 0 ]; then
|
||||
echo $output > $script-output.txt
|
||||
if [ $? -eq 0 ]; then
|
||||
echo "Execution completed successfully."
|
||||
else
|
||||
echo "===================================================="
|
||||
echo "| $script FAILED!"
|
||||
echo "===================================================="
|
||||
echo "Output of the execution: "
|
||||
echo $output
|
||||
failed=$failed" "$script
|
||||
fi
|
||||
|
||||
# Restart the necessary containers
|
||||
# Note: Tika does not store data and therefore can be left running
|
||||
if [[ "$make_python_path_editable" == "RESTART" ]]; then
|
||||
docker stop elasticsearch
|
||||
docker rm elasticsearch
|
||||
docker run -d -p 9200:9200 --name elasticsearch -e "discovery.type=single-node" -e "ES_JAVA_OPTS=-Xms128m -Xmx256m" elasticsearch:7.9.2
|
||||
fi
|
||||
|
||||
# Clean up datasets and SQLite DBs to avoid crashing the next tutorial
|
||||
git clean -f
|
||||
|
||||
|
||||
11
.github/workflows/tutorials.yml
vendored
11
.github/workflows/tutorials.yml
vendored
@ -23,15 +23,6 @@ jobs:
|
||||
- name: Setup Python
|
||||
uses: ./.github/actions/python_cache/
|
||||
|
||||
- name: Run Elasticsearch
|
||||
run: docker run -d -p 9200:9200 -e "discovery.type=single-node" -e "ES_JAVA_OPTS=-Xms128m -Xmx256m" elasticsearch:7.9.2
|
||||
|
||||
- name: Run Apache Tika
|
||||
run: docker run -d -p 9998:9998 -e "TIKA_CHILD_JAVA_OPTS=-JXms128m" -e "TIKA_CHILD_JAVA_OPTS=-JXmx128m" apache/tika:1.24.1
|
||||
|
||||
- name: Run GraphDB
|
||||
run: docker run -d -p 7200:7200 --name graphdb-instance-tutorial docker-registry.ontotext.com/graphdb-free:9.4.1-adoptopenjdk11
|
||||
|
||||
- name: Install pdftotext
|
||||
run: wget --no-check-certificate https://dl.xpdfreader.com/xpdf-tools-linux-4.04.tar.gz && tar -xvf xpdf-tools-linux-4.04.tar.gz && sudo cp xpdf-tools-linux-4.04/bin64/pdftotext /usr/local/bin
|
||||
|
||||
@ -71,4 +62,4 @@ jobs:
|
||||
token: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
- name: Run tutorials
|
||||
run: ./.github/utils/tutorials.sh ${{ env.pythonLocation }} "${{ steps.diff.outputs.added_modified }}" "${{ env.DONT_RUN }}" "EDITABLE"
|
||||
run: ./.github/utils/tutorials.sh ${{ env.pythonLocation }} "${{ steps.diff.outputs.added_modified }}" "${{ env.DONT_RUN }}" "EDITABLE" "RESTART"
|
||||
|
||||
13
.github/workflows/tutorials_nightly.yml
vendored
13
.github/workflows/tutorials_nightly.yml
vendored
@ -63,7 +63,7 @@ jobs:
|
||||
rm wiki_gameofthrones_txt1_mini.zip
|
||||
|
||||
- name: Run tutorials
|
||||
run: ./.github/utils/tutorials.sh ${{ env.pythonLocation }} "tutorials/*.ipynb" "${{ env.DONT_RUN }}"
|
||||
run: ./.github/utils/tutorials.sh ${{ env.pythonLocation }} "tutorials/*.ipynb" "${{ env.DONT_RUN }}" "EDITABLE" "RESTART"
|
||||
|
||||
|
||||
scripts:
|
||||
@ -77,15 +77,6 @@ jobs:
|
||||
with:
|
||||
python-version: 3.7
|
||||
|
||||
- name: Run Elasticsearch
|
||||
run: docker run -d -p 9200:9200 -e "discovery.type=single-node" -e "ES_JAVA_OPTS=-Xms128m -Xmx256m" elasticsearch:7.9.2
|
||||
|
||||
- name: Run Apache Tika
|
||||
run: docker run -d -p 9998:9998 -e "TIKA_CHILD_JAVA_OPTS=-JXms128m" -e "TIKA_CHILD_JAVA_OPTS=-JXmx128m" apache/tika:1.24.1
|
||||
|
||||
- name: Run GraphDB
|
||||
run: docker run -d -p 7200:7200 --name graphdb-instance-tutorial docker-registry.ontotext.com/graphdb-free:9.4.1-adoptopenjdk11
|
||||
|
||||
- name: Install pdftotext
|
||||
run: wget --no-check-certificate https://dl.xpdfreader.com/xpdf-tools-linux-4.04.tar.gz && tar -xvf xpdf-tools-linux-4.04.tar.gz && sudo cp xpdf-tools-linux-4.04/bin64/pdftotext /usr/local/bin
|
||||
|
||||
@ -116,4 +107,4 @@ jobs:
|
||||
rm wiki_gameofthrones_txt1_mini.zip
|
||||
|
||||
- name: Run tutorials
|
||||
run: ./.github/utils/tutorials.sh ${{ env.pythonLocation }} "tutorials/*.py" "${{ env.DONT_RUN }}"
|
||||
run: ./.github/utils/tutorials.sh ${{ env.pythonLocation }} "tutorials/*.py" "${{ env.DONT_RUN }}" "EDITABLE" "RESTART"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user