Merge branch 'downstream-refactor' of xgitlab.cels.anl.gov:argo/libnrm into downstream-refactor

.gitlab-ci.yaml

+stages:
+  - build
+
+make:generic:
+  stage: build
+  script:
+    - ./autogen.sh
+    - mkdir build
+    - ./configure --prefix=`pwd`/build
+    - make
+    - make install
+  artifacts:
+    paths:
+      - tests/*.log
+  except:
+    - /^wip.*/
+    - /^WIP.*/
+
+helloworld.integration.test:
+  stage: test
+  script:
+    - nix-shell .integration.nix --run "argotk.hs helloworld"
+  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:
+    - /^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:
+    - /^wip\/.*/
+    - /^WIP\/.*/
+  tags:
+    - integration

.integration.nix

 { argotest ? (builtins.fetchGit {
     url = https://xgitlab.cels.anl.gov/argo/argotest.git;
-    ref="refactor-argotk";
-    rev="e96e94a17a8046d0f7c8b2908dcb5fb25ead7b96"; })
+    ref="master";
+    rev="646d42f7b64f56cdb3ff54a7b4a59e0dfad3209c";
+})
 }:
 (import argotest {
   libnrm-src = ./.;
+  nrm-src = builtins.fetchGit {
+      url = https://xgitlab.cels.anl.gov/argo/nrm.git;
+      ref="downstream-refactor";
+      rev="37f5594287f77e42f3bf5f6b5a89f387c8905137";
+    };
 }).test