bug fixes

Author: vlktomas

default.nix

@@ -23,6 +23,7 @@ rec {
     desktopPhpLaravelCli = import ./desktop/PHP/laravel-cli/ci.nix {};
 
     # distributed
+    # FIXME not always reproducible
     distributedSparkPi = import ./distributed/Spark/pi/ci.nix {};
 
     # mobile
@@ -51,7 +52,7 @@ rec {
 
   # all pipelines jobs
   examplesPipelinesJobs = forEach (attrValues examples) (example: example.pipelineJob);
-  #examplesPipelines = catAttrs "pipelineJob" (attrValues examples);
+  #examplesPipelinesJobs = catAttrs "pipelineJob" (attrValues examples);
 
   # all pipelines phases merged
   examplesPipelinesZipped =

distributed/Spark/pi/app.nix

@@ -38,7 +38,7 @@ let
     outputHashMode = "recursive";
     outputHashAlgo = "sha256";
     #outputHash = stdenv.lib.fakeSha256;
-    outputHash = "0dk96374ls9jrw9dp85k4nq87nrnq2wvx20rn81ihxglg957hpig";
+    outputHash = "0kr2g4nbr5l00sd3z1z6yawcfiwhwb7fq2pnnk4nm1a9r373w6sa";
   };
 in
   stdenv.mkDerivation rec {

distributed/Spark/pi/cd-vbox.nix

@@ -16,27 +16,28 @@ in
 
     network.description = "Spark Pi deployed to VirtualBox";
 
-    master = {
+    master = { config, ... }: {
 
       imports = [ deploymentNodes.master ];
 
-      services.pi.masterIp = "192.168.56.101";
+      services.pi.masterIp = config.networking.privateIPv4;
       services.pi.submitArgs = "--executor-memory 512M --driver-memory 512M";
 
       deployment.targetEnv = "virtualbox";
-      deployment.virtualbox.memorySize = 1536; # megabytes
-      deployment.virtualbox.vcpu = 2; # number of cpus
+      deployment.virtualbox.memorySize = 1536;
+      deployment.virtualbox.vcpu = 2;
     };
 
-  } // lib.listToAttrs (map (n: lib.nameValuePair "worker${lib.fixedWidthNumber 2 n}" {
+  } // lib.listToAttrs (map (n: lib.nameValuePair "worker${lib.fixedWidthNumber 2 n}" ({ config, ... }: {
 
     imports = [ deploymentNodes."worker${lib.fixedWidthNumber 2 n}" ];
 
     services.pi.workerArgs = "--memory 768M";
-    services.pi.workerIp = "192.168.56.1${lib.fixedWidthNumber 2 (n+1)}";
+    services.pi.workerIp = config.networking.privateIPv4;
 
     deployment.targetEnv = "virtualbox";
-    deployment.virtualbox.memorySize = 1536; # megabytes
-    deployment.virtualbox.vcpu = 2; # number of cpus
+    deployment.virtualbox.memorySize = 1536;
+    deployment.virtualbox.vcpu = 2;
+
+  })) (lib.range 1 workersCount))
 
-  }) (lib.range 1 workersCount))

distributed/Spark/pi/cicd.sh

@@ -18,7 +18,7 @@ if [ $1 = "deploy-test" ]; then
     nixops set-args --arg workersCount 2 -d ${DEPLOYMENT_VBOX_NAME}
     nixops deploy -d ${DEPLOYMENT_VBOX_NAME} --force-reboot
     sleep 30s
-    nixops ssh master -- systemctl status pi --no-pager -l | grep "Pi is roughly 3.1"
+    nixops ssh -d ${DEPLOYMENT_VBOX_NAME} master -- systemctl status pi --no-pager -l | grep "Pi is roughly 3.1"
     nixops destroy -d ${DEPLOYMENT_VBOX_NAME} --confirm
     nixops delete -d ${DEPLOYMENT_VBOX_NAME}
     exit 0

multitier/Python/helloanswer/cd-vbox.nix

@@ -21,17 +21,17 @@ in
       imports = [ deploymentNodes.server ];
 
       deployment.targetEnv = "virtualbox";
-      deployment.virtualbox.memorySize = 1024; # megabytes
-      deployment.virtualbox.vcpu = 2; # number of cpus
+      deployment.virtualbox.memorySize = 1024;
+      deployment.virtualbox.vcpu = 2;
     };
 
     client = {
 
       imports = [ deploymentNodes.client ];
 
       deployment.targetEnv = "virtualbox";
-      deployment.virtualbox.memorySize = 1024; # megabytes
-      deployment.virtualbox.vcpu = 2; # number of cpus
+      deployment.virtualbox.memorySize = 1024;
+      deployment.virtualbox.vcpu = 2;
     };
 
   }

multitier/Python/helloanswer/cicd.sh

@@ -16,7 +16,7 @@ if [ $1 = "deploy-test" ]; then
     fi
     nixops create ./cd-vbox.nix -d ${DEPLOYMENT_VBOX_NAME}
     nixops deploy -d ${DEPLOYMENT_VBOX_NAME} --force-reboot
-    nixops ssh server -- client-wrapped | grep "Hello World!"
+    nixops ssh -d ${DEPLOYMENT_VBOX_NAME} server -- client-wrapped | grep "Hello World!"
     nixops destroy -d ${DEPLOYMENT_VBOX_NAME} --confirm
     nixops delete -d ${DEPLOYMENT_VBOX_NAME}
     exit 0

template/cd.nix

@@ -19,6 +19,10 @@ in
       imports = [
         ./module.nix
       ];
+
+      services.example.enable = true;
+      services.example.someSecreFile = someSecreFile;
+
     };
 
   }

template/cicd.sh

@@ -17,7 +17,7 @@ if [ $1 = "deploy-test" ]; then
     nixops create ./cd-vbox.nix -d ${DEPLOYMENT_VBOX_NAME}
     nixops deploy -d ${DEPLOYMENT_VBOX_NAME} --force-reboot
     echo "Hello, world!" > expected
-    nixops ssh server -- example > given
+    nixops ssh -d ${DEPLOYMENT_VBOX_NAME} server -- example > given
     diff expected given
     nixops destroy -d ${DEPLOYMENT_VBOX_NAME} --confirm
     nixops delete -d ${DEPLOYMENT_VBOX_NAME}

web/Laravel/laravel/cd-vbox.nix

@@ -48,8 +48,8 @@ in
       };
 
       deployment.targetEnv = "virtualbox";
-      deployment.virtualbox.memorySize = 1024; # megabytes
-      deployment.virtualbox.vcpu = 2; # number of cpus
+      deployment.virtualbox.memorySize = 1024;
+      deployment.virtualbox.vcpu = 2;
     };
 
   } // lib.optionalAttrs (!storageLocally) {

web/Laravel/laravel/cicd.sh

@@ -19,7 +19,7 @@ if [ $1 = "deploy-test" ]; then
     nixops deploy -d ${DEPLOYMENT_VBOX_NAME} --force-reboot
     nixops info -d ${DEPLOYMENT_VBOX_NAME}
     # get webserver IP address
-    WEBSERVER_IP=$(nixops info --deployment laravel-vbox --no-eval --plain | awk '{print $1 " " $(NF)}' | grep webserver | awk '{print $(NF)}')
+    WEBSERVER_IP=$(nixops info -d ${DEPLOYMENT_VBOX_NAME} --no-eval --plain | awk '{print $1 " " $(NF)}' | grep webserver | awk '{print $(NF)}')
     curl --insecure https://${WEBSERVER_IP}
     nixops destroy -d ${DEPLOYMENT_VBOX_NAME} --confirm
     nixops delete -d ${DEPLOYMENT_VBOX_NAME}