Merge branch 'nix-simplify' into 'master'

Updating the CI tests.

See merge request !10

.gitlab-ci.yml

+variables:
+  ARGOPKGS : "https://xgitlab.cels.anl.gov/argo/argopkgs/-/archive/master/argopkgs-master.tar.gz"
+  EXTRA : "--containers ./."
+
 stages:
   - build
   - test
+  - quality
 
-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/time.log
-      - _output/.argo_nodeos_config_exit_message
-    expire_in: 1 week
-  except:
-    - /^wip\/.*/
-    - /^WIP\/.*/
-  tags:
-    - integration
-
-
-.nix-build:
-  stage: build
-  tags:
-    - integration
-
-.nix-integration:
-  stage: test
-  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
-
-containers.build:
-  extends: .nix-build
-  script:
-    - CACHE=$(mktemp -d --suffix=nixcache /tmp/deletable-nix-cache-XXXX)
-    - XDG_CACHE_HOME=$CACHE nix-build .nix -A containers
-    - rm -rf $CACHE
-
-libnrm.build:
-  extends: .nix-build
-  script:
-    - CACHE=$(mktemp -d --suffix=nixcache /tmp/deletable-nix-cache-XXXX)
-    - XDG_CACHE_HOME=$CACHE nix-build .nix -A libnrm
-    - rm -rf $CACHE
-
-nrm.build:
-  extends: .nix-build
-  script:
-    - CACHE=$(mktemp -d --suffix=nixcache /tmp/deletable-nix-cache-XXXX)
-    - XDG_CACHE_HOME=$CACHE nix-build .nix -A nrm
-    - rm -rf $CACHE
-
-TestHello.test:
-  extends: .nix-integration
-  script:
-    - CACHE=$(mktemp -d --suffix=nixcache /tmp/deletable-nix-cache-XXXX)
-    - XDG_CACHE_HOME=$CACHE nix-shell .nix -A test --run "argotk.hs TestHello"
-    - rm -rf $CACHE
-
-TestListen.test:
-  extends: .nix-integration
-  script:
-    - CACHE=$(mktemp -d --suffix=nixcache /tmp/deletable-nix-cache-XXXX)
-    - XDG_CACHE_HOME=$CACHE nix-shell .nix -A test --run "argotk.hs TestListen"
-    - rm -rf $CACHE
-
-TestPerfwrapper.test:
-  extends: .nix-integration
-  script:
-    - CACHE=$(mktemp -d --suffix=nixcache /tmp/deletable-nix-cache-XXXX)
-    - XDG_CACHE_HOME=$CACHE nix-shell .nix -A test --run "argotk.hs TestPerfwrapper"
-    - rm -rf $CACHE
+include:
+ - https://xgitlab.cels.anl.gov/argo/argopkgs/raw/continuous-integration/gitlab-ci/argonix.yml
+ - https://xgitlab.cels.anl.gov/argo/argopkgs/raw/continuous-integration/gitlab-ci/components.yml
+ - https://xgitlab.cels.anl.gov/argo/argopkgs/raw/continuous-integration/gitlab-ci/integration.yml
+ #- https://xgitlab.cels.anl.gov/argo/argopkgs/raw/continuous-integration/gitlab-ci/repoquality.yml

.integration.nix

-{ argotest ? (builtins.fetchGit {
-    url = https://xgitlab.cels.anl.gov/argo/argotest.git;
-    ref="refactor-argotk";
-    rev="e96e94a17a8046d0f7c8b2908dcb5fb25ead7b96"; })
-}:
-(import argotest {
-  containers-src = ./.;
-}).test

.nix/default.nix

-let argotest =
-  builtins.fetchTarball
-  "https://xgitlab.cels.anl.gov/argo/argotest/-/archive/master/argotest-master.tar.gz";
-in import "${argotest}/test.nix" {
-  containers-override = ./..;
-  testName = "base";
-}