afterok

Author: antgonza

.github/workflows/qiita-plugin-ci.yml

@@ -83,7 +83,7 @@ jobs:
           conda create -q --yes -n qtp-sequencing python=3.6 pip pigz quast
           conda activate qtp-sequencing
           pip --quiet install https://github.com/qiita-spots/qtp-sequencing/archive/master.zip
-          export QIITA_SERVER_CERT=`pwd`/qiita-dev/qiita_core/support_files/server.crt
+          export QIITA_SERVER_CERT=`pwd`/qiita-dev/qiita_core/support_files/ci_rootca.crt
           export QIITA_CONFIG_FP=`pwd`/qiita-dev/qiita_core/support_files/config_test_local.cfg
           configure_qtp_sequencing --env-script "source /home/runner/.profile; conda activate qtp-sequencing" --server-cert $QIITA_SERVER_CERT
 
@@ -99,7 +99,7 @@ jobs:
           if [[ $flash_version != *"v1.2.11"* ]]; then echo "wrong flash version", $flash_version; exit 1; fi
           if [[ $spades_version != *"v3.15.2"* ]]; then echo "wrong spades version", $spades_version; exit 1; fi
 
-          export QIITA_SERVER_CERT=`pwd`/qiita-dev/qiita_core/support_files/server.crt
+          export QIITA_SERVER_CERT=`pwd`/qiita-dev/qiita_core/support_files/ci_rootca.crt
           export QIITA_CONFIG_FP=`pwd`/qiita-dev/qiita_core/support_files/config_test_local.cfg
           export ENVIRONMENT="source /home/runner/.profile; conda activate qp-spades"
           pip install -U pip
@@ -110,7 +110,7 @@ jobs:
         shell: bash -l {0}
         run: |
           conda activate qiita
-          export QIITA_SERVER_CERT=`pwd`/qiita-dev/qiita_core/support_files/server.crt
+          export QIITA_SERVER_CERT=`pwd`/qiita-dev/qiita_core/support_files/ci_rootca.crt
           export QIITA_CONFIG_FP=`pwd`/qiita-dev/qiita_core/support_files/config_test_local.cfg
           sed "s#/home/runner/work/qiita/qiita#${PWD}/qiita-dev/#g" `pwd`/qiita-dev/qiita_core/support_files/config_test.cfg > ${QIITA_CONFIG_FP}
 
@@ -143,7 +143,7 @@ jobs:
           COVER_PACKAGE: ${{ matrix.cover_package }}
         run: |
           conda activate qp-spades
-          export QIITA_SERVER_CERT=`pwd`/qiita-dev/qiita_core/support_files/server.crt
+          export QIITA_SERVER_CERT=`pwd`/qiita-dev/qiita_core/support_files/ci_rootca.crt
           export QIITA_CONFIG_FP=`pwd`/qiita-dev/qiita_core/support_files/config_test_local.cfg
           export ENVIRONMENT="source /home/runner/.profile; conda activate qp-spades"
 

README.rst

@@ -21,7 +21,7 @@ Qiita Client can perform secure connections against the Qiita server:
 
 .. code-block:: bash
 
-    $ export QIITA_SERVER_CERT=<QIITA_INSTALL_PATH>/qiita_core/support_files/server.crt
+    $ export QIITA_SERVER_CERT=<QIITA_INSTALL_PATH>/qiita_core/support_files/ci_rootca.crt
 
 .. |Build Status| image:: https://github.com/qiita-spots/qp-spades/actions/workflows/qiita-plugin-ci.yml/badge.svg
    :target: https://github.com/qiita-spots/qp-spades/actions/workflows/qiita-plugin-ci.yml

scripts/start_qp_spades

@@ -78,7 +78,7 @@ def execute(url, job_id, output_dir):
         # Submitting jobs and returning id
         main_job = run(['sbatch', main_fp], stdout=PIPE)
         main_job_id = main_job.stdout.decode('utf8')
-        finish_job = run(['sbatch', '-d', f'afterany:{main_job_id}',
+        finish_job = run(['sbatch', '-d', f'afterok:{main_job_id}',
                           finish_fp], stdout=PIPE)
         finish_job_id = finish_job.stdout.decode('utf8')
         print(f'{main_job_id}, {finish_job_id}')