Skip to content

Commit e31e661

Browse files
antgonzaElDeveloper
authored andcommitted
Fix branch (#2176)
* improving analysis listing * addressing @ElDeveloper comments * adding list artifacts * changing names * fixing . -> , * only_biom * actually using only_biom * sleep * moving sleep * import sleep * sleep(0.8) * sleep(1) * addressing @ElDeveloper comments * flake8 * is_qiita_job * job_info -> ji * addressing @ElDeveloper comments * fixing branch
1 parent b0891a1 commit e31e661

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

.travis.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ before_install:
2121
- chmod +x ascp-install-3.5.4.102989-linux-64-qiita.sh
2222
- ./ascp-install-3.5.4.102989-linux-64-qiita.sh
2323
# once we have ebi testing we should uncomment this line
24+
# look for EBI below as it's part of this
2425
# - if [ ${TRAVIS_PULL_REQUEST} == "false" ]; then openssl aes-256-cbc -K $encrypted_a2e23aea5f14_key -iv $encrypted_a2e23aea5f14_iv -in qiita_core/support_files/config_test_travis.cfg.enc -out qiita_core/support_files/config_test_travis.cfg -d ; fi
2526
install:
2627
# install a few of the dependencies that pip would otherwise try to install
@@ -43,10 +44,11 @@ before_script:
4344
# Some of the tests rely on the plugin system to complete successfuly.
4445
# Thus, we need a qiita webserver running to be able to execute the tests.
4546
- export MOI_CONFIG_FP=`pwd`/qiita_core/support_files/config_test.cfg
46-
- if [ ${TRAVIS_PULL_REQUEST} == "false" ]; then
47-
export QIITA_CONFIG_FP=`pwd`/qiita_core/support_files/config_test_travis.cfg;
48-
export MOI_CONFIG_FP=`pwd`/qiita_core/support_files/config_test_travis.cfg;
49-
fi
47+
# EBI, see the end of before_install about why this block is commented out
48+
# - if [ ${TRAVIS_PULL_REQUEST} == "false" ]; then
49+
# export QIITA_CONFIG_FP=`pwd`/qiita_core/support_files/config_test_travis.cfg;
50+
# export MOI_CONFIG_FP=`pwd`/qiita_core/support_files/config_test_travis.cfg;
51+
# fi
5052
- ipython profile create qiita-general --parallel
5153
- qiita-env start_cluster qiita-general
5254
- qiita-env make --no-load-ontologies

0 commit comments

Comments
 (0)