-
Notifications
You must be signed in to change notification settings - Fork 0
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
Tickets/dm36232: Install ts-integrationtests and robotframework_EFD to integrationtests image #148
Conversation
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.
We need to have a talk about this container. Somethings got lost translation.
23d1c4a
to
af07aef
Compare
I just merged my PR, you may want to rebase your branch to main before merging the PR.. Also, remember to update the version history. |
…nt (there's one in the deploy-env image).
…ests and robotframework conda packages and checking out the robotframework_EFD repo. Explicitly checking out the main and develop branches of the robotframework_EFD repo.
…e-build conventions and removed obsolete steps. Added a startup.sh script. Updated the README to accurately document the Dockerfile.
af07aef
to
74378cd
Compare
05514d8
to
c86ef85
Compare
build/integrationtests/Dockerfile
Outdated
@@ -1,23 +1,29 @@ | |||
ARG cycle | |||
ARG hub | |||
ARG integrationtests |
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.
If I remember correctly, all the args defined before the "FROM" clause are wiped out just after it.
Also, it is best if you use the ARGS close to where you need it which, in this case, is just after line 13...
This makes sure the layers are better reused when you change their values...
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.
Done
build/integrationtests/Dockerfile
Outdated
LABEL maintainer Rob Bovill <rbovill@lsst.org> | ||
LABEL integrationtests=${integrationtests} |
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.
Consider adding this LABEL at the end of the build, or at least after you install the package.. This helps docker build reuse layers.
You can see how we do on the other build, e.g.:
ts_cycle_build/build/ataos/Dockerfile
Lines 55 to 58 in c318fd5
LABEL ts_idl=${ts_idl} \ | |
ts_observatory_control=${ts_observatory_control} \ | |
ts_config_attcs=${config} \ | |
ts_ataos=${ataos} |
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.
Done
build/integrationtests/Dockerfile
Outdated
|
||
LABEL integrationtests=${integrationtests} | ||
WORKDIR ${HOME}/robotframework_EFD | ||
RUN ${HOME}/.checkout_repo.sh main develop |
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.
you just cloned the repo a couple lines above, do you need to do this?
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.
I guess we'll only want main for the actual executions. Removed.
…ture; right now it is just dummy command. The RUN_ARG value will be updated once we determine what it should do.
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.
Looks good...
No description provided.