use 'notknl' tag appropriately

deployments/ci.nix

@@ -32,24 +32,6 @@ let
        permissions = "600";
      };
 
-     systemd.services.tunnel-hydra= {
-       path = [pkgs.autossh];
-       enable= true;
-       description = "ssh tunnel to hydra";
-       after = [];
-       wantedBy = [ "multi-user.target" ];
-       environment.AUTOSSH_GATETIME="0";
-       environment.AUTOSSH_POLL="30";
-       serviceConfig = {
-         User = "fre";
-         Restart = "on-success";
-         Type = "simple";
-         ExecStart = ''
-           ${pkgs.autossh}/bin/autossh -M 0 -N -o "ServerAliveInterval 30" -o "ServerAliveCountMax 3" -T -R 2210:localhost:22 fre@argo.freux.fr -i /run/id_buildfarm
-        '';
-       };
-     };
-
     require=argomodules;
     environment.argo.known-hosts.enable=true;
     environment.argo.provider-tacc.enable=true;

deployments/gitlab-runner.nix

@@ -87,7 +87,8 @@ in
             --non-interactive=true \
             --name ${cfg.name} \
             --executor "shell" \
-            --tag-list "integration" "notknl"\
+            --maximum-timeout 1800 \
+            --tag-list "integration,notknl"\
           '';
           ExecStart = ''${cfg.package.bin}/bin/gitlab-runner run \
             --working-directory ${cfg.workDir} \

gitlab-ci/applications.yml

@@ -12,7 +12,6 @@
   stage: build
   tags:
     - integration
-    - notknl
 
 buildAMG:
   extends: .build
@@ -23,6 +22,8 @@ buildQMCPack:
   extends: .build
   script:
     - "argonix build qmcpack -g --argopkgs $ARGOPKGS $EXTRA --verbose"
+  tags:
+    - notknl
 
 buildOpenMC:
   extends: .build
@@ -91,10 +92,5 @@ testQMCPack:
   extends: .applications
   script:
     - "argonix build testQMCPack -g --argopkgs $ARGOPKGS $EXTRA --verbose"
-
-testQMCPack-knl:
-  extends: .applications
-  script:
-    - "argonix build testQMCPack -g --argopkgs $ARGOPKGS $EXTRA --verbose"
   tags:
-    - knl
+    - notknl