[ci] Updated integration tests.

These use libnrm/downstream-refactor and should be updated once that
branch is merged.

.gitlab-ci.yml

@@ -23,7 +23,7 @@ flake8:
     - /^wip\/.*/
     - /^WIP\/.*/
 
-integration.test:
+helloworld.integration.test:
   stage: test
   script:
     - nix-shell .integration.nix --run "argotk.hs helloworld"
@@ -34,7 +34,25 @@ integration.test:
       - _output/daemon_out.log
       - _output/daemon_out.log
       - _output/nrm.log
-      - _output/time.log
+      - _output/.argo_nodeos_config_exit_message
+    expire_in: 1 week
+  except:
+    - /^wip\/.*/
+    - /^WIP\/.*/
+  tags:
+    - integration
+
+perfwrapper.integration.test:
+  stage: test
+  script:
+    - nix-shell .integration.nix --run "argotk.hs perfwrapper"
+  artifacts:
+    paths:
+      - _output/cmd_err.log
+      - _output/cmd_out.log
+      - _output/daemon_out.log
+      - _output/daemon_out.log
+      - _output/nrm.log
       - _output/.argo_nodeos_config_exit_message
     expire_in: 1 week
   except:

.integration.nix

 { argotest ? (builtins.fetchGit {
     url = https://xgitlab.cels.anl.gov/argo/argotest.git;
-    ref="refactor-argotk";
-    rev="a20358e5b72f267eb8e2a9152e62c9ebbb3b2d4a"; })
+    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