Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
tsoc
openmm
Commits
ca3b526c
Commit
ca3b526c
authored
Aug 29, 2019
by
Jason Swails
Browse files
Update docker configurations
parent
c82a8dca
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
36 deletions
+14
-36
devtools/Jenkinsfile
devtools/Jenkinsfile
+14
-14
devtools/ci/jenkins/Dockerfile
devtools/ci/jenkins/Dockerfile
+0
-11
devtools/ci/jenkins/Dockerfile.opencl
devtools/ci/jenkins/Dockerfile.opencl
+0
-11
No files found.
devtools/Jenkinsfile
View file @
ca3b526c
...
@@ -6,15 +6,15 @@ pipeline {
...
@@ -6,15 +6,15 @@ pipeline {
parallel
{
parallel
{
stage
(
"Build and test CUDA platform"
)
{
stage
(
"Build and test CUDA platform"
)
{
agent
{
agent
{
dockerfile
{
docker
{
dir
"devtools/ci/jenkins"
image
"swails/openmm-all:latest"
label
"cuda"
label
"cuda && docker"
alwaysPull
true
}
}
}
}
steps
{
steps
{
sh
'''#!/bin/bash -
l
ex
sh
'''#!/bin/bash -ex
git clean -fxd && git checkout .
git clean -fxd && git checkout .
env
export OPENMM_CUDA_COMPILER=`which nvcc`
export OPENMM_CUDA_COMPILER=`which nvcc`
bash -e devtools/ci/jenkins/install.sh
bash -e devtools/ci/jenkins/install.sh
bash -e devtools/ci/jenkins/test.sh -R 'TestCuda' --parallel 2
bash -e devtools/ci/jenkins/test.sh -R 'TestCuda' --parallel 2
...
@@ -24,17 +24,15 @@ pipeline {
...
@@ -24,17 +24,15 @@ pipeline {
stage
(
"Build and test OpenCL platform"
)
{
stage
(
"Build and test OpenCL platform"
)
{
agent
{
agent
{
docker
file
{
docker
{
dir
"devtools/ci/jenkins
"
image
"swails/openmm-all:latest
"
label
"cuda"
label
"cuda
&& docker
"
filename
"Dockerfile.opencl"
alwaysPull
true
}
}
}
}
steps
{
steps
{
sh
'''#!/bin/bash -
l
ex
sh
'''#!/bin/bash -ex
git clean -fxd && git checkout .
git clean -fxd && git checkout .
env
export OPENMM_CUDA_COMPILER=`which nvcc`
bash -e devtools/ci/jenkins/install.sh
bash -e devtools/ci/jenkins/install.sh
bash -e devtools/ci/jenkins/test.sh -R 'TestOpenCL' --parallel 2
bash -e devtools/ci/jenkins/test.sh -R 'TestOpenCL' --parallel 2
'''
'''
...
@@ -43,8 +41,10 @@ pipeline {
...
@@ -43,8 +41,10 @@ pipeline {
stage
(
"Build/test CPU platforms"
)
{
stage
(
"Build/test CPU platforms"
)
{
agent
{
agent
{
dockerfile
{
docker
{
dir
"devtools/ci/jenkins"
image
"swails/openmm-all:latest"
label
"docker"
alwaysPull
true
}
}
}
}
...
...
devtools/ci/jenkins/Dockerfile
deleted
100644 → 0
View file @
c82a8dca
FROM
nvidia/cuda:10.1-devel-ubuntu18.04
ENV
PATH="/opt/miniconda/bin:${PATH}"
RUN
apt-get update
&&
\
apt-get
install
-y
wget git gromacs doxygen gfortran libfftw3-dev gcc g++ bzip2 automake make lsb-core
&&
\
wget https://repo.continuum.io/miniconda/Miniconda3-4.5.11-Linux-x86_64.sh
-O
miniconda.sh
&&
\
bash miniconda.sh
-b
-p
"/opt/miniconda"
&&
\
rm
-f
miniconda.sh
&&
\
mkdir
/.conda
&&
chmod
-R
777 /.conda
&&
chmod
-R
777 /opt/miniconda
&&
\
conda
install
-y
cmake numpy scipy pytest swig cython
devtools/ci/jenkins/Dockerfile.opencl
deleted
100644 → 0
View file @
c82a8dca
FROM nvidia/opencl:devel-ubuntu18.04
ENV PATH="/opt/miniconda/bin:${PATH}"
RUN apt-get update && \
apt-get install -y wget git gromacs doxygen gfortran libfftw3-dev gcc g++ bzip2 automake make lsb-core && \
wget https://repo.continuum.io/miniconda/Miniconda3-4.5.11-Linux-x86_64.sh -O miniconda.sh && \
bash miniconda.sh -b -p "/opt/miniconda" && \
rm -f miniconda.sh && \
mkdir /.conda && chmod -R 777 /.conda && chmod -R 777 /opt/miniconda && \
conda install -y cmake numpy scipy pytest swig cython
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment