-
Notifications
You must be signed in to change notification settings - Fork 2
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
PUBLIC-2591: App code extraction, test improvement #16
Changes from 2 commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,9 +2,6 @@ name: KBase SDK Tests | |
|
||
on: | ||
pull_request: | ||
branches: | ||
- main | ||
- develop | ||
|
||
jobs: | ||
sdk_tests: | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,25 +4,24 @@ LABEL maintainer="KBase Developers [[email protected]]" | |
WORKDIR /kb/module | ||
# Update | ||
RUN apt-get update \ | ||
&& apt-get upgrade -y \ | ||
&& sed -i 's/\(.*DST_Root_CA_X3.crt\)/!\1/' /etc/ca-certificates.conf \ | ||
&& update-ca-certificates \ | ||
&& apt-get -y install xvfb \ | ||
&& pip install --upgrade pip && \ | ||
&& apt-get upgrade -y && \ | ||
update-ca-certificates && \ | ||
apt-get -y install xvfb curl && \ | ||
# Install FastTree | ||
mkdir -p /kb/module/FastTree/bin && \ | ||
cd /kb/module/FastTree/bin && \ | ||
curl -o FastTree http://www.microbesonline.org/fasttree/FastTree && \ | ||
chmod 555 FastTree | ||
chmod 555 FastTree && \ | ||
pip install --upgrade pip && \ | ||
# install the python requirements | ||
# Note: You must use PyQt5==5.11.3 on debian | ||
pip install ete3==3.1.2 PyQt5==5.11.3 numpy==1.23.1 pytest coverage pytest-cov vcrpy | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. moved up the python installation to prior to copying over the repo There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. No requirements file? |
||
|
||
COPY ./ /kb/module | ||
|
||
RUN mkdir -p /kb/module/work && \ | ||
chmod -R a+rw /kb/module && \ | ||
mv /kb/module/compile_report.json /kb/module/work/compile_report.json && \ | ||
# install the python requirements | ||
# Note: You must use PyQt5==5.11.3 on debian | ||
pip install ete3==3.1.2 PyQt5==5.11.3 numpy==1.23.1 pytest coverage pytest-cov | ||
mv /kb/module/compile_report.json /kb/module/work/compile_report.json | ||
|
||
WORKDIR /kb/module | ||
ENTRYPOINT [ "./scripts/entrypoint.sh" ] | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,23 +1,4 @@ | ||
[kb_fasttree] | ||
kbase-endpoint = {{ kbase_endpoint }} | ||
job-service-url = {{ job_service_url }} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. none of the rest of these are used - just the workspace URL and the scratch dir |
||
workspace-url = {{ workspace_url }} | ||
shock-url = {{ shock_url }} | ||
{% if handle_url %} | ||
handle-service-url = {{ handle_url }} | ||
{% else %} | ||
handle-service-url = {{ kbase_endpoint }}/handle_service | ||
{% endif %} | ||
{% if srv_wiz_url %} | ||
service-wizard-url = {{ srv_wiz_url }} | ||
{% else %} | ||
service-wizard-url = {{ kbase_endpoint }}/service_wizard | ||
{% endif %} | ||
njsw-url = {{ njsw_url }} | ||
{% if auth_service_url %} | ||
auth-service-url = {{ auth_service_url }} | ||
{% endif %} | ||
{% if auth_service_url_allow_insecure %} | ||
auth-service-url-allow-insecure = {{ auth_service_url_allow_insecure }} | ||
{% endif %} | ||
scratch = /kb/module/work/tmp |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
run the tests on every PR