From cee4fbd175686a848889efc5df214ee4583e38b8 Mon Sep 17 00:00:00 2001
From: Valentin Reis <valentin.reis@gmail.com>
Date: Mon, 4 Feb 2019 15:53:07 -0600
Subject: [PATCH] Updating the CI tests.

---
 .gitlab-ci.yml                  | 87 +--------------------------------
 .nix/default.nix => default.nix |  4 +-
 2 files changed, 4 insertions(+), 87 deletions(-)
 rename .nix/default.nix => default.nix (76%)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index be785c3..4bb2386 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,88 +1,5 @@
+include: 'https://xgitlab.cels.anl.gov/argo/argotest/raw/master/gitlab/binary_rename.yml'
+
 stages:
   - build
   - test
-
-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
diff --git a/.nix/default.nix b/default.nix
similarity index 76%
rename from .nix/default.nix
rename to default.nix
index 155a60f..b619f3c 100644
--- a/.nix/default.nix
+++ b/default.nix
@@ -2,6 +2,6 @@ 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";
+  containers-override = ./.;
+  testName = "split";
 }
-- 
GitLab