Skip to content

Commit 96f67c6

Browse files
authored
fix: Change cosim test build branch to master (#594)
* fix: Change cosim test build branch to master * test: Add vadl-cosim to test image builder
1 parent 3c43d67 commit 96f67c6

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

vadl/test/vadl/iss/CosimTest.java

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -139,12 +139,13 @@ private ImageFromDockerfile getIssImage(Path generatedIssSources,
139139

140140
d.workDir("/work");
141141

142-
// get rust toolchain from rustup and build the cosim broker
142+
// get rust toolchain from rustup
143143
d.run("curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y");
144144
d.env("PATH", "/root/.cargo/bin:$PATH");
145-
d.run("git clone --branch feature/ppc-cosim-test https://github.com/OpenVADL/openvadl.git");
146-
//d.run("git clone https://github.com/OpenVADL/openvadl.git");
147-
d.workDir("/work/openvadl/vadl-cosim");
145+
146+
// build the cosim broker
147+
d.copy("/vadl-cosim", "/work/vadl-cosim");
148+
d.workDir("/work/vadl-cosim");
148149
d.env("RUSTC_WRAPPER", "sccache");
149150
d.run("sccache --start-server && cargo build --release -p vadl-cosim-broker && sccache -s");
150151

@@ -166,7 +167,9 @@ private ImageFromDockerfile getIssImage(Path generatedIssSources,
166167
.withFileFromPath("iss", generatedIssSources)
167168
// make cosim scripts and configs available to image builder
168169
.withFileFromClasspath("/cosim_configs", "/cosim_configs")
169-
.withFileFromClasspath("/cosim_scripts", getScript());
170+
.withFileFromClasspath("/cosim_scripts", getScript())
171+
// add vadl-cosim to image builder
172+
.withFileFromPath("/vadl-cosim", Path.of("..", "vadl-cosim"));
170173

171174
// as we have to use the same network as the redis cache, we have to build it there
172175
return redisCache.setupEnv(dockerImage);

0 commit comments

Comments
 (0)