Commit 9357ed7b authored by Valentin Reis's avatar Valentin Reis
Browse files

[ci] Updating the CI to use libnrm/master.

This commit switches the CI to libnrm/master. It also refactors the nix
code in .nix with stronger guarantees. Now, a hash verifies the content
of the code the integration tests are run against.
parent 37f55942
Pipeline #4782 passed with stages
in 2 minutes and 18 seconds
stages:
- build
- test
- style
......@@ -23,10 +24,31 @@ flake8:
- /^wip\/.*/
- /^WIP\/.*/
nrm.build:
stage: build
script:
- nix-build .nix -A nrm
tags:
- integration
libnrm.build:
stage: build
script:
- nix-build .nix -A libnrm
tags:
- integration
containers.build:
stage: build
script:
- nix-build .nix -A containers
tags:
- integration
helloworld.integration.test:
stage: test
script:
- nix-shell .integration.nix --run "argotk.hs helloworld"
- nix-shell .nix -A test --run "argotk.hs helloworld"
artifacts:
paths:
- _output/cmd_err.log
......@@ -45,7 +67,7 @@ helloworld.integration.test:
perfwrapper.integration.test:
stage: test
script:
- nix-shell .integration.nix --run "argotk.hs perfwrapper"
- nix-shell .nix -A test --run "argotk.hs perfwrapper"
artifacts:
paths:
- _output/cmd_err.log
......
{ argotest ? (builtins.fetchGit {
url = https://xgitlab.cels.anl.gov/argo/argotest.git;
ref="master";
rev="646d42f7b64f56cdb3ff54a7b4a59e0dfad3209c";
})
}:
(import argotest {
nrm-src = ./.;
libnrm-src = builtins.fetchGit {
url = https://xgitlab.cels.anl.gov/argo/libnrm.git;
ref="downstream-refactor"; };
}).test
let hostPkgs = import <nixpkgs> {};
in
{
nrm ? ../.,
argotest ? (hostPkgs.nix-update-source.fetch pins/argotest.json).src ,
libnrm ? (hostPkgs.nix-update-source.fetch pins/libnrm.json).src ,
containers ? (hostPkgs.nix-update-source.fetch pins/containers.json).src
}:
import "${argotest}/default.nix"
{
nrm-src = nrm;
libnrm-src = libnrm;
containers-src = containers;
}
{
"fetch": {
"args": {
"fetchSubmodules": false,
"rev": "63c8d3facc1233a46a21c3a64d65da4b637b9587",
"sha256": "0h6d95n005jkwq5parzwvl0bw81ii88mgrfaficz4hrlfjknczmi",
"url": "https://xgitlab.cels.anl.gov/argo/argotest.git"
},
"fn": "fetchgit"
},
"rev": "refs/heads/master",
"type": "fetchgit",
"url": "https://xgitlab.cels.anl.gov/argo/argotest.git"
}
\ No newline at end of file
{
"fetch": {
"args": {
"fetchSubmodules": false,
"rev": "3e8a8ca82e223d0d7f713027fdfd35289e0ef89b",
"sha256": "1h2alkay1q7hmw1fq7y37v8fr44dv0r23qnjjdmz1ra3c28b1xq0",
"url": "https://xgitlab.cels.anl.gov/argo/containers.git"
},
"fn": "fetchgit"
},
"rev": "refs/heads/master",
"type": "fetchgit",
"url": "https://xgitlab.cels.anl.gov/argo/containers.git"
}
\ No newline at end of file
{
"fetch": {
"args": {
"fetchSubmodules": false,
"rev": "c81c458de93a353a7b5ba19cd124c02ed8ee85f3",
"sha256": "07f9ilxabxfs8iy0l7lq5788lqfrc6ckghdfxxaziiyqav90ayf0",
"url": "https://xgitlab.cels.anl.gov/argo/libnrm.git"
},
"fn": "fetchgit"
},
"rev": "refs/heads/master",
"type": "fetchgit",
"url": "https://xgitlab.cels.anl.gov/argo/libnrm.git"
}
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment