Skip to content

fix-3064 #3080

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 112 commits into from
Mar 3, 2021
Merged

fix-3064 #3080

merged 112 commits into from
Mar 3, 2021

Conversation

antgonza
Copy link
Member

No description provided.

@antgonza antgonza changed the title [WIP] fix-3064 fix-3064 Mar 2, 2021
Copy link
Contributor

@ElDeveloper ElDeveloper left a comment

Choose a reason for hiding this comment

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

Looks great, @antgonza just a few small suggestions.

Comment on lines +16 to +17
- cover_package: "qiita_db"
- cover_package: "qiita_pet qiita_core qiita_ware"
Copy link
Contributor

Choose a reason for hiding this comment

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

Should have the same effect, so just in case you are interested in containing everything in one line.

Suggested change
- cover_package: "qiita_db"
- cover_package: "qiita_pet qiita_core qiita_ware"
- cover_package: ["qiita_db", "qiita_pet qiita_core qiita_ware"]


- name: Basic dependencies install
env:
COVER_PACKAGE: ${{ matrix.COVER_PACKAGE }}
Copy link
Contributor

Choose a reason for hiding this comment

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

Shouldn't this be:

Suggested change
COVER_PACKAGE: ${{ matrix.COVER_PACKAGE }}
COVER_PACKAGE: ${{ matrix.cover_package }}

Copy link
Member Author

Choose a reason for hiding this comment

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

Sure, note that it works as expected so my guess is case insensitive

COVER_PACKAGE: ${{ matrix.COVER_PACKAGE }}
shell: bash -l {0}
run: |
echo "Testing: " $COVER_PACKAGE
Copy link
Contributor

Choose a reason for hiding this comment

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

Same as above.

echo "StrictModes no" > sshd_config
sudo mv sshd_config /etc/ssh/sshd_config
sudo systemctl restart ssh
ps -elf | grep ssh
Copy link
Contributor

Choose a reason for hiding this comment

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

Is this still needed or is it a command for debugging?

Comment on lines +126 to +128
pushd webdis
./webdis &
popd
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
pushd webdis
./webdis &
popd
$PWD/webdis/webdis &

Copy link
Member Author

Choose a reason for hiding this comment

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

In my own experience the webdis expects and looks for files in the folder; if you run from outside the folder the expected files are not where they should be

export QIITA_CONFIG_FP=`pwd`/qiita_core/support_files/config_test.cfg
export REDBIOM_HOST="http://localhost:7379"

echo "1. Setting up redis"
Copy link
Contributor

Choose a reason for hiding this comment

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

Instead of using echo, another alternative is to put each of these sections under a -name: Setting up redis tag so that the UI summarizes which step failed, etc.

Copy link
Member Author

Choose a reason for hiding this comment

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

I'm OK with echos! :)

file: codecov.yml
fail_ci_if_error: true

lint:
Copy link
Contributor

Choose a reason for hiding this comment

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

Up to you but maybe the main job could depend on the lint job so that the full test suite isn't run before you find there's a syntax error or something like that. That would also mean that the tests aren't run if there are linting errors which might be undesirable.

run: python -m pip install --upgrade pip
- name: lint
run: |
pip install -q flake8
Copy link
Contributor

Choose a reason for hiding this comment

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

Isn't this missing the command that lints the code?

@ElDeveloper
Copy link
Contributor

Looks great, thanks @antgonza!

@ElDeveloper ElDeveloper merged commit a6578bc into dev Mar 3, 2021
antgonza added a commit that referenced this pull request Mar 19, 2021
* adding creation and modification timestamps to prep_templates (#3066)

* adding creation and modification timestamps to prep_templates

* Apply suggestions from code review [skip ci]

Co-authored-by: Yoshiki Vázquez Baeza <yoshiki@ucsd.edu>

Co-authored-by: Yoshiki Vázquez Baeza <yoshiki@ucsd.edu>

* fix #3068 (#3069)

* minor improvements (#3067)

* minor improvements

* fix test

* adding @wasade suggestion

* minor fixes (#3073)

* fix #3072 (#3074)

* fix #3072

* flake8

* fix #3076 (#3077)

* fix #3076

* addressing @ElDeveloper comments

* fix #3070 (#3075)

* fix #3070

* Apply suggestions from code review

Co-authored-by: Yoshiki Vázquez Baeza <yoshiki@ucsd.edu>

* flake8

Co-authored-by: Yoshiki Vázquez Baeza <yoshiki@ucsd.edu>

* fix-3064 (#3080)

* Create qiita-ci.yml

* add passwd to psql

* nginx + redis

* redis via conda

* redis-server - -> redis-server --

* daemonize -> daemonize

* conda libevent

* apt-get libevent-dev

* adding multiple sections

* rm travis_retry

* add missing activagte

* onfig_test.cfg

* rm indent

* add 1 indent

* pgport

* add drop

* change db name

* redis version

* redis -> redbiom version

* split tests

* source .profile

* adding ssh command

* mkdir ~/.ssh/

* only ssh

* pushing to retrigger

* add run

* split ssh conf/run

* 60367309

* add bash

* fix ident

* rm ssh cmd

* strict=no

* localhost

* mod permissions

* user ssh

* rm keys

* echos

* start ssh service

* ssh -vvv

* split setup/test

* localhost -> 127

* localhost -> 127

* rm ssh setup

* -o StrictHostKeyChecking=no

* change key creation

* echo sshd_config

* readd ssh config

* cp sshd_config and then move

* rm echos

* extra qiita folder

* ls test_data

* rm qiita folder

* use key in .ssh

* more ssh params

* tee -> >

* chmod

* fullpath

* ls key

* rm localhost

* params

* rsa -> rsa-sha2-256

* rm root login

* readd -o StrictHostKeyChecking=no

* minimizing params

* permissions

* cleaning up

* comments => echo

* -o StrictHostKeyChecking=no

* export REDBIOM_HOST=http://127.0.0.1:7379

* localhost -> 127.0.0.1

* add runner

* cover package

* cleaning env vars

* renaming jobs

* redbiom host

* add env vars via export

* changing echo

* add env COVER_PACKAGE

* rm user sftp

* just qiita_db

* open_sftp -> SFTPClient

* +1 worker

* only SCPClient

* ssh.SCPClient -> SCPClient

* return sftp/ssh back

* just qiita_db

* rm sftp

* add all tests

* BASE_URL = https://127.0.0.1:8383

* bash -c

* start_biom

* start_biom 127

* populate QIITA_SERVER_CERT

* nginx 127

* adding ports to conf

* lowering ports

* service qiita

* 8383 postgres

* curl test

* mkdir nginx

* moving tests around

* moving curl up

* echos for curl

* sleep 10

* 127.0.0.1 -> localhost

* returning some localhost to 127...

* qiita_pet!

* final clean up

* kill qiita first

* addreesing @ElDeveloper comments

* checkout repo for flake8

* split cover_package

* Workflows GUI (#3078)

* fix #3076

* addressing @ElDeveloper comments

* adding workflows GUI

* improve HTML

* db changes and improvements

* comment out new db changes

* rm default_workflows from PluginHandler.get

* Apply suggestions from code review [skip ci]

Co-authored-by: Yoshiki Vázquez Baeza <yoshiki@ucsd.edu>

Co-authored-by: Yoshiki Vázquez Baeza <yoshiki@ucsd.edu>

* fix #3081 (#3082)

* fix #3081

* generate_analysis_list_per_study to speed up retrival

* minor modifications

* split sql

* addressing @ElDeveloper comments

* add Command.processing_jobs (#3085)

* add Command.processing_jobs

* Update qiita_db/software.py [skip ci]

Co-authored-by: Yoshiki Vázquez Baeza <yoshiki@ucsd.edu>

Co-authored-by: Yoshiki Vázquez Baeza <yoshiki@ucsd.edu>

* Improve workflows (#3083)

* fix #3076

* addressing @ElDeveloper comments

* adding workflows GUI

* improve HTML

* db changes and improvements

* comment out new db changes

* rm default_workflows from PluginHandler.get

* improving workflows after deployment

* fix error

* clean up

* minor fixes

* improving html

* comments from @justinshaffer

* addressing @ElDeveloper comments

* 2021.03 (#3084)

* 2021.03

* add Command.processing_jobs to changelog

* codecov

* codecov required

* codecov token

Co-authored-by: Yoshiki Vázquez Baeza <yoshiki@ucsd.edu>
@antgonza antgonza deleted the fix-3064 branch March 19, 2021 01:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants