Merge pull request #600 from zeenix/fix-ci-tests

Bring back acceptance-tests to CI

Author: MalloZup

.travis.yml

@@ -1,25 +1,31 @@
-dist:     trusty
+dist:     xenial
 sudo:     false
 language: go
 go:
   - 1.11.x
 env:
-  - GO111MODULE=on GOFLAGS=-mod=vendor
+  - GO111MODULE=on GOFLAGS=-mod=vendor LIBVIRT_DEFAULT_URI='qemu+unix:///session' TF_LIBVIRT_DISABLE_PRIVILEGED_TESTS=1 TF_LIBVIRT_RNG_DEV='/dev/random' TF_LOG=DEBUG
 git:
   depth: 1
   go_import_path: github.com/dmacvicar/terraform-provider-libvirt
 install:        true
 before_script:
   - curl -sLo /tmp/terraform.zip https://releases.hashicorp.com/terraform/0.12.0/terraform_0.12.0_linux_amd64.zip
   - sudo unzip /tmp/terraform.zip -d /usr/local/bin
+  - sudo bash ./travis/setup-host
 addons:
   apt:
     packages:
     - libvirt-dev
+    - libvirt-daemon
+    - qemu-system-x86
+    - qemu-utils
+    - genisoimage
     - xsltproc
 script:
   - make fmt-check
   - make vet-check
   - make lint-check
   - make tf-check
   - make test
+  - make testacc TEST_ARGS="-test.failfast"

CONTRIBUTING.md

@@ -67,6 +67,20 @@ Or run a group of test with a verbose loglevel:
 TF_LOG=DEBUG make testacc TEST_ARGS="-run TestAccLibvirtNet*"
 ```
 
+If you run the tests on an unprivileged connection (e.g session libvirt), some of the acceptance tests will need to be disabled (mainly the networking ones) through an environment
+variable:
+
+```bash
+LIBVIRT_DEFAULT_URI='qemu+unix:///session' TF_LIBVIRT_DISABLE_PRIVILEGED_TESTS=1 make testacc
+```
+
+If '/dev/random' is not available on the platform you run the acceptance tests on, you can override the device used
+through an environment variable as well:
+
+```bash
+TF_LIBVIRT_RNG_DEV='/dev/random' make testacc
+```
+
 ### Code coverage:
 
 Run first the testacc suite.

libvirt/domain_def.go

@@ -69,14 +69,6 @@ func newDomainDef() libvirtxml.Domain {
 					},
 				},
 			},
-			RNGs: []libvirtxml.DomainRNG{
-				{
-					Model: "virtio",
-					Backend: &libvirtxml.DomainRNGBackend{
-						Random: &libvirtxml.DomainRNGBackendRandom{Device: "/dev/urandom"},
-					},
-				},
-			},
 		},
 		Features: &libvirtxml.DomainFeatureList{
 			PAE:  &libvirtxml.DomainFeature{},
@@ -91,6 +83,21 @@ func newDomainDef() libvirtxml.Domain {
 		domainDef.Type = "kvm"
 	}
 
+	// FIXME: We should allow setting this from configuration as well.
+	rngDev := os.Getenv("TF_LIBVIRT_RNG_DEV")
+	if rngDev == "" {
+		rngDev = "/dev/urandom"
+	}
+
+	domainDef.Devices.RNGs = []libvirtxml.DomainRNG{
+		{
+			Model: "virtio",
+			Backend: &libvirtxml.DomainRNGBackend{
+				Random: &libvirtxml.DomainRNGBackendRandom{Device: rngDev},
+			},
+		},
+	}
+
 	return domainDef
 }
 

libvirt/helpers_test.go

@@ -50,6 +50,12 @@ func testAccEnabled() bool {
 	return v == "1" || strings.ToLower(v) == "true"
 }
 
+func skipIfPrivilegedDisabled(t *testing.T) {
+	if os.Getenv("TF_LIBVIRT_DISABLE_PRIVILEGED_TESTS") != "" {
+		t.Skip("skipping test; Enviornemnt variable `TF_LIBVIRT_DISABLE_PRIVILEGED_TESTS` is set")
+	}
+}
+
 // //////////////////////////////////////////////////////////////////
 // general
 // //////////////////////////////////////////////////////////////////

libvirt/resource_libvirt_cloud_init_test.go

@@ -13,6 +13,8 @@ import (
 func TestAccLibvirtCloudInit_CreateCloudInitDiskAndUpdate(t *testing.T) {
 	var volume libvirt.StorageVol
 	randomResourceName := acctest.RandStringFromCharSet(10, acctest.CharSetAlpha)
+	randomPoolName := acctest.RandStringFromCharSet(10, acctest.CharSetAlpha)
+	randomPoolPath := "/tmp/terraform-provider-libvirt-pool-" + randomPoolName
 	// this structs are contents values we expect.
 	expectedContents := Expected{UserData: "#cloud-config", NetworkConfig: "network:", MetaData: "instance-id: bamboo"}
 	expectedContents2 := Expected{UserData: "#cloud-config2", NetworkConfig: "network2:", MetaData: "instance-id: bamboo2"}
@@ -27,12 +29,18 @@ func TestAccLibvirtCloudInit_CreateCloudInitDiskAndUpdate(t *testing.T) {
 		Steps: []resource.TestStep{
 			{
 				Config: fmt.Sprintf(`
+					resource "libvirt_pool" "%s" {
+								name = "%s"
+								type = "dir"
+								path = "%s"
+                            }
 					resource "libvirt_cloudinit_disk" "%s" {
 								name           = "%s"
 								user_data      = "#cloud-config"
 								meta_data = "instance-id: bamboo"
 								network_config = "network:"
-							}`, randomResourceName, randomIsoName),
+                                pool           = "${libvirt_pool.%s.name}"
+							}`, randomPoolName, randomPoolName, randomPoolPath, randomResourceName, randomIsoName, randomPoolName),
 
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttr(
@@ -43,12 +51,18 @@ func TestAccLibvirtCloudInit_CreateCloudInitDiskAndUpdate(t *testing.T) {
 			},
 			{
 				Config: fmt.Sprintf(`
+					resource "libvirt_pool" "%s" {
+								name = "%s"
+								type = "dir"
+								path = "%s"
+                            }
 					resource "libvirt_cloudinit_disk" "%s" {
 								name           = "%s"
 								user_data      = "#cloud-config2"
 								meta_data = "instance-id: bamboo2"
 								network_config = "network2:"
-							}`, randomResourceName, randomIsoName),
+                                pool           = "${libvirt_pool.%s.name}"
+							}`, randomPoolName, randomPoolName, randomPoolPath, randomResourceName, randomIsoName, randomPoolName),
 
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttr(
@@ -59,10 +73,16 @@ func TestAccLibvirtCloudInit_CreateCloudInitDiskAndUpdate(t *testing.T) {
 			},
 			{
 				Config: fmt.Sprintf(`
+					resource "libvirt_pool" "%s" {
+								name = "%s"
+								type = "dir"
+								path = "%s"
+                            }
 					resource "libvirt_cloudinit_disk" "%s" {
 								name           = "%s"
 								user_data      = "#cloud-config2"
-							}`, randomResourceName, randomIsoName),
+                                pool           = "${libvirt_pool.%s.name}"
+							}`, randomPoolName, randomPoolName, randomPoolPath, randomResourceName, randomIsoName, randomPoolName),
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttr(
 						"libvirt_cloudinit_disk."+randomResourceName, "name", randomIsoName),
@@ -74,10 +94,16 @@ func TestAccLibvirtCloudInit_CreateCloudInitDiskAndUpdate(t *testing.T) {
 			// https://github.com/dmacvicar/terraform-provider-libvirt/issues/313
 			{
 				Config: fmt.Sprintf(`
+                        resource "libvirt_pool" "%s" {
+								    name = "%s"
+                                    type = "dir"
+                                    path = "%s"
+                                }
 						resource "libvirt_cloudinit_disk" "%s" {
 									name           = "%s"
 									user_data      = "#cloud-config4"
-								}`, randomResourceName, randomIsoName),
+                                    pool           = "${libvirt_pool.%s.name}"
+								}`, randomPoolName, randomPoolName, randomPoolPath, randomResourceName, randomIsoName, randomPoolName),
 				ExpectNonEmptyPlan: true,
 				PlanOnly:           true,
 				Check: resource.ComposeTestCheckFunc(
@@ -98,13 +124,20 @@ func TestAccLibvirtCloudInit_CreateCloudInitDiskAndUpdate(t *testing.T) {
 func TestAccLibvirtCloudInit_ManuallyDestroyed(t *testing.T) {
 	var volume libvirt.StorageVol
 	randomResourceName := acctest.RandStringFromCharSet(10, acctest.CharSetAlpha)
+	randomPoolName := acctest.RandStringFromCharSet(10, acctest.CharSetAlpha)
+	randomPoolPath := "/tmp/terraform-provider-libvirt-pool-" + randomPoolName
 
 	testAccCheckLibvirtCloudInitConfigBasic := fmt.Sprintf(`
-    	resource "libvirt_cloudinit_disk" "%s" {
-  	  name           = "%s"
-			pool           = "default"
+        resource "libvirt_pool" "%s" {
+            name = "%s"
+            type = "dir"
+            path = "%s"
+        }
+        resource "libvirt_cloudinit_disk" "%s" {
+            name           = "%s"
+            pool           = "${libvirt_pool.%s.name}"
 			user_data      = "#cloud-config\nssh_authorized_keys: []\n"
-		}`, randomResourceName, randomResourceName)
+		}`, randomPoolName, randomPoolName, randomPoolPath, randomResourceName, randomResourceName, randomPoolName)
 
 	resource.Test(t, resource.TestCase{
 		PreCheck:  func() { testAccPreCheck(t) },

libvirt/resource_libvirt_coreos_ignition_test.go

@@ -14,6 +14,8 @@ func TestAccLibvirtIgnition_Basic(t *testing.T) {
 	var volume libvirt.StorageVol
 	randomServiceName := acctest.RandStringFromCharSet(10, acctest.CharSetAlpha) + ".service"
 	randomIgnitionName := acctest.RandStringFromCharSet(10, acctest.CharSetAlpha)
+	randomPoolName := acctest.RandStringFromCharSet(10, acctest.CharSetAlpha)
+	randomPoolPath := "/tmp/terraform-provider-libvirt-pool-" + randomPoolName
 	var config = fmt.Sprintf(`
 	data "ignition_systemd_unit" "acceptance-test-systemd" {
 		name    = "%s"
@@ -26,11 +28,18 @@ func TestAccLibvirtIgnition_Basic(t *testing.T) {
 		]
 	}
 
+    resource "libvirt_pool" "%s" {
+        name = "%s"
+        type = "dir"
+        path = "%s"
+    }
+
 	resource "libvirt_ignition" "ignition" {
 		name    = "%s"
 		content = "${data.ignition_config.acceptance-test-config.rendered}"
+        pool    = "${libvirt_pool.%s.name}"
 	}
-	`, randomServiceName, randomIgnitionName)
+	`, randomServiceName, randomPoolName, randomPoolName, randomPoolPath, randomIgnitionName, randomPoolName)
 
 	resource.Test(t, resource.TestCase{
 		PreCheck:     func() { testAccPreCheck(t) },
@@ -44,7 +53,7 @@ func TestAccLibvirtIgnition_Basic(t *testing.T) {
 					resource.TestCheckResourceAttr(
 						"libvirt_ignition.ignition", "name", randomIgnitionName),
 					resource.TestCheckResourceAttr(
-						"libvirt_ignition.ignition", "pool", "default"),
+						"libvirt_ignition.ignition", "pool", randomPoolName),
 				),
 			},
 		},