Add a test cluster

jobs/fastcgi.nomad

@@ -4,6 +4,16 @@ variable "test" {
   default     = false
 }
 
+variable "main_nomad_addr" {
+  type    = string
+  default = ""
+}
+
+variable "mysql_password_mediawiki" {
+  type    = string
+  default = ""
+}
+
 job "fastcgi" {
   datacenters = ["dc1"]
 
@@ -95,7 +105,7 @@ job "fastcgi" {
       }
 
       template {
-        data        = var.hotfix
+        data        = var.test ? var.hotfix_test : var.hotfix
         destination = "local/Hotfix.php"
         change_mode = "noop"
       }
@@ -286,6 +296,16 @@ $wgBlacklistSettings = [
 EOF
 }
 
+variable "hotfix_test" {
+  type    = string
+  default = <<EOF
+<?php
+$wgDBserver = '$${var.main_nomad_addr}';
+$wgDBuser = 'mediawiki';
+$wgDBpassword = '$${var.mysql_password_mediawiki}';
+EOF
+}
+
 variable "postrun" {
   type    = string
   default = <<EOF

terraform/backupbot.tf

@@ -1,6 +1,4 @@
 resource "nomad_job" "backupbot" {
-  count = !var.test ? 1 : 0
-
   depends_on = [nomad_job.mysql]
 
   detach  = false

terraform/base.tf

@@ -3,6 +3,11 @@ variable "nomad_token" {
   sensitive = true
 }
 
+variable "test_nomad_token" {
+  type      = string
+  sensitive = true
+}
+
 terraform {
   required_version = "~> 1.0"
 
@@ -38,3 +43,11 @@ provider "nomad" {
   # Should be specified explicitly because of the bug https://github.com/femiwiki/nomad/issues/99
   region = "global"
 }
+
+provider "nomad" {
+  alias     = "test"
+  address   = data.terraform_remote_state.aws.outputs.test_nomad_addr
+  secret_id = var.test_nomad_token
+  # Should be specified explicitly because of the bug https://github.com/femiwiki/nomad/issues/99
+  region = "global"
+}

terraform/mediawiki.tf

@@ -1,24 +1,10 @@
 locals {
-  hcl_vals = {
-    test = var.test
-  }
-}
-
-resource "nomad_job" "mysql_without_ebs" {
-  count = var.test ? 1 : 0
-
-  jobspec = file("../jobs/mysql.nomad")
-  detach  = false
-
-  hcl2 {
-    allow_fs = true
-    vars     = local.hcl_vals
+  main_hcl_vals = {
+    test = false
   }
 }
 
 resource "nomad_job" "mysql" {
-  count = !var.test ? 1 : 0
-
   depends_on = [
     data.nomad_plugin.ebs,
     nomad_csi_volume_registration.mysql,
@@ -29,7 +15,7 @@ resource "nomad_job" "mysql" {
 
   hcl2 {
     allow_fs = true
-    vars     = local.hcl_vals
+    vars     = local.main_hcl_vals
   }
 }
 
@@ -39,6 +25,20 @@ resource "nomad_job" "memcached" {
 
   hcl2 {
     allow_fs = true
+    vars     = local.main_hcl_vals
+  }
+}
+
+resource "nomad_job" "test_memcached" {
+  provider = nomad.test
+  jobspec  = file("../jobs/memcached.nomad")
+  detach   = false
+
+  hcl2 {
+    allow_fs = true
+    vars = {
+      test = true
+    }
   }
 }
 
@@ -53,7 +53,26 @@ resource "nomad_job" "fastcgi" {
 
   hcl2 {
     allow_fs = true
-    vars     = local.hcl_vals
+    vars     = local.main_hcl_vals
+  }
+}
+
+resource "nomad_job" "test_fastcgi" {
+  provider = nomad.test
+  depends_on = [
+    nomad_job.memcached,
+  ]
+
+  jobspec = file("../jobs/fastcgi.nomad")
+  detach  = false
+
+  hcl2 {
+    allow_fs = true
+    vars = {
+      test                     = true
+      main_nomad_addr          = data.terraform_remote_state.aws.outputs.nomad_addr
+      mysql_password_mediawiki = var.mysql_password_mediawiki
+    }
   }
 }
 
@@ -68,6 +87,25 @@ resource "nomad_job" "http" {
 
   hcl2 {
     allow_fs = true
-    vars     = local.hcl_vals
+    vars     = local.main_hcl_vals
+  }
+}
+
+resource "nomad_job" "test_http" {
+  provider = nomad.test
+  depends_on = [
+    # TODO Replace with S3 CSI or something
+    # data.nomad_plugin.ebs,
+    # nomad_csi_volume_registration.caddycerts,
+  ]
+
+  jobspec = file("../jobs/http.nomad")
+  detach  = false
+
+  hcl2 {
+    allow_fs = true
+    vars = {
+      test = true
+    }
   }
 }

terraform/variables.tf

@@ -1,5 +1,4 @@
-variable "test" {
-  type        = bool
-  description = "Uses jobs for the test server. Without CSI, backup, certificates etc"
-  default     = false
+variable "mysql_password_mediawiki" {
+  type      = string
+  sensitive = true
 }