Skip to content

Commit 4bc81f4

Browse files
committed
Update Docker testing for the separate native-image installable
1 parent e832ab8 commit 4bc81f4

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

doc/contributor/docker.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ $ jt docker print --fedora28 --source --rvm
3030
Or, to run a full set of tests on a set of new release candidate tarballs:
3131

3232
```bash
33-
$ jt docker test --graalvm graalvm-ce.tar.gz ruby-installable.jar --test release_branch
34-
$ jt docker test --graalvm graalvm-ee.tar.gz ruby-installable.jar --test release_branch
35-
$ jt docker test --graalvm graalvm-ee.tar.gz ruby-installable.jar --rebuild-images --test release_branch
33+
$ jt docker test --graalvm graalvm-ce.tar.gz ruby-installable-ce.jar --test release_branch
34+
$ jt docker test --graalvm graalvm-ee.tar.gz ruby-installable-ee.jar --test release_branch
35+
$ jt docker test --graalvm graalvm-ee.tar.gz ruby-installable-ee.jar --rebuild-images native-image-installable-ee.jar --test release_branch
3636
$ jt docker test --standalone truffleruby-linux-amd64.tar.gz --test release_branch
3737
```
3838

tool/jt.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2078,6 +2078,7 @@ def dockerfile(*args)
20782078
source_branch = args.shift
20792079
when '--rebuild-images'
20802080
rebuild_images = true
2081+
native_component = args.shift
20812082
when '--no-rebuild-openssl'
20822083
rebuild_openssl = false
20832084
when '--no-manager'
@@ -2199,6 +2200,7 @@ def dockerfile(*args)
21992200

22002201
if rebuild_images
22012202
if [:public, :graalvm].include?(install_method)
2203+
lines.push "RUN #{graalvm_bin}/gu install --file /test/#{native_component} | tee install.log"
22022204
lines.push "RUN #{graalvm_base}/bin/gu rebuild-images ruby"
22032205
else
22042206
abort "can't rebuild images for a build not from public or from local GraalVM components"

0 commit comments

Comments
 (0)