Merge pull request #10 from antgonza/afterok

afterok
qiita-spots · Feb 6, 2024 · 25e5702 · 25e5702
2 parents 9270d90 + dd972bc
commit 25e5702
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/.github/workflows/qiita-plugin-ci.yml b/.github/workflows/qiita-plugin-ci.yml
@@ -84,8 +84,9 @@ jobs:
           conda create -q --yes -n qp-meta python=3.9 biom-format sortmerna=2.1b samtools pigz
           conda activate qp-meta
 
-          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
+
           pip --quiet install -U pip
           pip --quiet install .
           pip --quiet install coveralls
@@ -105,7 +106,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}
 
@@ -138,7 +139,7 @@ jobs:
         run: |
           conda activate qp-meta
 
-          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 QC_SORTMERNA_DB_DP=$PWD/qp_meta/sortmerna/databases/rRNA_databases/
           export ENVIRONMENT="source /home/runner/.profile; conda activate qp-meta"

diff --git a/scripts/start_meta b/scripts/start_meta
@@ -52,7 +52,7 @@ def execute(url, job_id, out_dir):
         # Submitting jobs and returning id
         main_job = run(['sbatch', main_fp], stdout=PIPE)
         main_job_id = main_job.stdout.decode('utf8').split()[-1]
-        finish = run(['sbatch', '-d', f'afterany:{main_job_id}', finish_fp],
+        finish = run(['sbatch', '-d', f'afterok:{main_job_id}', finish_fp],
                      stdout=PIPE)
         finish_job_id = finish.stdout.decode('utf8').split()[-1]
         print(f'{main_job_id}, {finish_job_id}')