Skip to content

Commit cb274bd

Browse files
committed
Revert Docker and Jenkins files.
1 parent fd332dc commit cb274bd

File tree

2 files changed

+12
-31
lines changed

2 files changed

+12
-31
lines changed

jenkins/Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,6 @@ RUN apt-get update && \
1111
apt-get clean && \
1212
rm -rf /var/lib/apt/lists/*
1313

14-
RUN rm -rf /usr/local/.juliaup
15-
RUN rm -rf /usr/local/.julia
14+
ARG JULIA=1.6
15+
RUN curl -s -L https://julialang-s3.julialang.org/bin/linux/x64/${JULIA}/julia-${JULIA}-latest-linux-x86_64.tar.gz | \
16+
tar -C /usr/local -x -z --strip-components=1 -f -

jenkins/Jenkinsfile

Lines changed: 9 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ pipeline {
1616
label 'gpu&&v100'
1717
filename 'Dockerfile'
1818
dir 'jenkins'
19-
additionalBuildArgs '--build-arg JULIA=lts'
19+
additionalBuildArgs '--build-arg JULIA=1.10'
2020
args '--gpus "device=1"'
2121
}
2222
}
@@ -27,12 +27,7 @@ pipeline {
2727
}
2828
steps {
2929
sh '''
30-
curl -fsSL https://install.julialang.org | sh -s -- --path /usr/local/.juliaup --yes;
31-
/usr/local/.juliaup/bin/juliaup add lts;
32-
/usr/local/.juliaup/bin/juliaup default lts;
33-
'''
34-
sh '''
35-
/usr/local/.juliaup/bin/julia -e 'using Pkg; Pkg.activate(temp=true); Pkg.Registry.update(); Pkg.update(); Pkg.develop(path="./NDTensors"); Pkg.develop(path="."); Pkg.test("NDTensors"; test_args=["cuda"])'
30+
julia -e 'using Pkg; Pkg.activate(temp=true); Pkg.Registry.update(); Pkg.update(); Pkg.develop(path="./NDTensors"); Pkg.develop(path="."); Pkg.test("NDTensors"; test_args=["cuda"])'
3631
'''
3732
}
3833
}
@@ -45,7 +40,7 @@ pipeline {
4540
label 'gpu&&v100'
4641
filename 'Dockerfile'
4742
dir 'jenkins'
48-
additionalBuildArgs '--build-arg JULIA=1'
43+
additionalBuildArgs '--build-arg JULIA=1.11'
4944
args '--gpus "device=1"'
5045
}
5146
}
@@ -56,12 +51,7 @@ pipeline {
5651
}
5752
steps {
5853
sh '''
59-
curl -fsSL https://install.julialang.org | sh -s -- --path /usr/local/.juliaup --yes;
60-
/usr/local/.juliaup/bin/juliaup add 1;
61-
/usr/local/.juliaup/bin/juliaup default 1;
62-
'''
63-
sh '''
64-
/usr/local/.juliaup/bin/julia -e 'using Pkg; Pkg.activate(temp=true); Pkg.Registry.update(); Pkg.update(); Pkg.develop(path="./NDTensors"); Pkg.develop(path="."); Pkg.test("NDTensors"; test_args=["cuda"])'
54+
julia -e 'using Pkg; Pkg.activate(temp=true); Pkg.Registry.update(); Pkg.update(); Pkg.develop(path="./NDTensors"); Pkg.develop(path="."); Pkg.test("NDTensors"; test_args=["cuda"])'
6555
'''
6656
}
6757
}
@@ -74,7 +64,7 @@ pipeline {
7464
label 'gpu&&v100'
7565
filename 'Dockerfile'
7666
dir 'jenkins'
77-
additionalBuildArgs '--build-arg JULIA=lts'
67+
additionalBuildArgs '--build-arg JULIA=1.10'
7868
args '--gpus "device=1"'
7969
}
8070
}
@@ -85,12 +75,7 @@ pipeline {
8575
}
8676
steps {
8777
sh '''
88-
curl -fsSL https://install.julialang.org | sh -s -- --path /usr/local/.juliaup --yes;
89-
/usr/local/.juliaup/bin/juliaup add lts;
90-
/usr/local/.juliaup/bin/juliaup default lts;
91-
'''
92-
sh '''
93-
/usr/local/.juliaup/bin/julia -e 'using Pkg; Pkg.activate(temp=true); Pkg.Registry.update(); Pkg.update(); Pkg.develop(path="./NDTensors"); Pkg.develop(path="."); Pkg.test("NDTensors"; test_args=["cutensor"])'
78+
julia -e 'using Pkg; Pkg.activate(temp=true); Pkg.Registry.update(); Pkg.update(); Pkg.develop(path="./NDTensors"); Pkg.develop(path="."); Pkg.test("NDTensors"; test_args=["cutensor"])'
9479
'''
9580
}
9681
}
@@ -103,7 +88,7 @@ pipeline {
10388
label 'gpu&&v100'
10489
filename 'Dockerfile'
10590
dir 'jenkins'
106-
additionalBuildArgs '--build-arg JULIA=1'
91+
additionalBuildArgs '--build-arg JULIA=1.11'
10792
args '--gpus "device=1"'
10893
}
10994
}
@@ -114,12 +99,7 @@ pipeline {
11499
}
115100
steps {
116101
sh '''
117-
curl -fsSL https://install.julialang.org | sh -s -- --path /usr/local/.juliaup --yes;
118-
/usr/local/.juliaup/bin/juliaup add 1;
119-
/usr/local/.juliaup/bin/juliaup default 1;
120-
'''
121-
sh '''
122-
/usr/local/.juliaup/bin/julia -e 'using Pkg; Pkg.activate(temp=true); Pkg.Registry.update(); Pkg.update(); Pkg.develop(path="./NDTensors"); Pkg.develop(path="."); Pkg.test("NDTensors"; test_args=["cutensor"])'
102+
julia -e 'using Pkg; Pkg.activate(temp=true); Pkg.Registry.update(); Pkg.update(); Pkg.develop(path="./NDTensors"); Pkg.develop(path="."); Pkg.test("NDTensors"; test_args=["cutensor"])'
123103
'''
124104
}
125105
}
@@ -168,4 +148,4 @@ pipeline {
168148
}
169149
}
170150
}
171-
}
151+
}

0 commit comments

Comments
 (0)