From 683431afa2ebd02dc178530dd503ca0e1f595458 Mon Sep 17 00:00:00 2001
From: Marin Salinas <marinssalinas@gmail.com>
Date: Wed, 6 Mar 2019 14:08:13 -0600
Subject: [PATCH] fix acceptance test configuration

---
 builder/osc/bsu/builder_acc_test.go          | 14 ++++++--------
 builder/osc/bsusurrogate/builder_acc_test.go | 16 +++++++++-------
 builder/osc/chroot/builder_acc_test.go       | 12 ++----------
 3 files changed, 17 insertions(+), 25 deletions(-)

diff --git a/builder/osc/bsu/builder_acc_test.go b/builder/osc/bsu/builder_acc_test.go
index f31f8c058..2bce61683 100644
--- a/builder/osc/bsu/builder_acc_test.go
+++ b/builder/osc/bsu/builder_acc_test.go
@@ -1,7 +1,4 @@
-/*
-Deregister the test image with
-aws oapi deregister-image --image-id $(aws oapi describe-images --output text --filters "Name=name,Values=packer-test-packer-test-dereg" --query 'Images[*].{ID:ImageId}')
-*/
+//TODO: explain how to delete the image.
 package bsu
 
 import (
@@ -16,9 +13,10 @@ import (
 
 func TestBuilderAcc_basic(t *testing.T) {
 	builderT.Test(t, builderT.TestCase{
-		PreCheck: func() { testAccPreCheck(t) },
-		Builder:  &Builder{},
-		Template: testBuilderAccBasic,
+		PreCheck:             func() { testAccPreCheck(t) },
+		Builder:              &Builder{},
+		Template:             testBuilderAccBasic,
+		SkipArtifactTeardown: true,
 	})
 }
 
@@ -47,7 +45,7 @@ const testBuilderAccBasic = `
 		"type": "test",
 		"region": "eu-west-2",
 		"vm_type": "t2.micro",
-		"source_omi": "ami-46260446",
+		"source_omi": "ami-65efcc11",
 		"ssh_username": "outscale",
 		"omi_name": "packer-test {{timestamp}}"
 	}]
diff --git a/builder/osc/bsusurrogate/builder_acc_test.go b/builder/osc/bsusurrogate/builder_acc_test.go
index 04b397f2a..0923d4865 100644
--- a/builder/osc/bsusurrogate/builder_acc_test.go
+++ b/builder/osc/bsusurrogate/builder_acc_test.go
@@ -12,9 +12,10 @@ import (
 
 func TestBuilderAcc_basic(t *testing.T) {
 	builderT.Test(t, builderT.TestCase{
-		PreCheck: func() { testAccPreCheck(t) },
-		Builder:  &Builder{},
-		Template: testBuilderAccBasic,
+		PreCheck:             func() { testAccPreCheck(t) },
+		Builder:              &Builder{},
+		Template:             testBuilderAccBasic,
+		SkipArtifactTeardown: true,
 	})
 }
 
@@ -26,9 +27,9 @@ const testBuilderAccBasic = `
 	"builders": [{
 		"type": "test",
 		"region": "eu-west-2",
-		"vm_type": "c4.large",
-		"source_omi": "ami-46260446",
-		"ssh_username": "ubuntu",
+		"vm_type": "t2.micro",
+		"source_omi": "ami-65efcc11",
+		"ssh_username": "outscale",
 		"omi_name": "packer-test {{timestamp}}",
 		"omi_virtualization_type": "hvm",
 		"subregion_name": "eu-west-2a",
@@ -38,7 +39,8 @@ const testBuilderAccBasic = `
 			"device_name" : "/dev/xvdf",
 			"delete_on_vm_deletion" : false,
 			"volume_size" : 10,
-			"iops": 300
+			"iops": 300,
+			"no_device": 0
 			}
 		],
 		"omi_root_device":{
diff --git a/builder/osc/chroot/builder_acc_test.go b/builder/osc/chroot/builder_acc_test.go
index df8256218..cb2fdd108 100644
--- a/builder/osc/chroot/builder_acc_test.go
+++ b/builder/osc/chroot/builder_acc_test.go
@@ -23,19 +23,11 @@ const testBuilderAccBasic = `
 	"builders": [{
 		"type": "test",
 		"region": "eu-west-2",
-		"source_omi": "ami-99466096",
+		"source_omi": "ami-65efcc11",
 		"omi_name": "packer-test-{{timestamp}}",
 		"omi_virtualization_type": "hvm",
 		"device_path": "/dev/xvdf",
 		"mount_partition": "0"
-	}],
-	"provisioners": [
-        {
-            "type": "shell",
-            "inline": [
-                "echo Packer-test | tee /tmp/test.txt"
-            ]
-        }
-    ]
+	}]
 }
 `