use the new /provision/kubevirt.io/tests directory and stop masking a…

…ssociate errors Signed-off-by: Vladik Romanovsky <[email protected]>
bk201 · Jun 17, 2020 · 4561ec5 · 4561ec5
1 parent 266b852
commit 4561ec5
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 9 deletions.
diff --git a/cluster-up-sha.txt b/cluster-up-sha.txt
@@ -1 +1 @@
-474b7fc29313416d0672e78e4c65a842e01b2c59
+48988e0253c73c9b0c6e3fdd484c76dadbe12826
diff --git a/cluster-up/cluster/images.sh b/cluster-up/cluster/images.sh
@@ -8,9 +8,9 @@ if [ -z $KUBEVIRTCI_PROVISION_CHECK ]; then
     IMAGES[k8s-fedora-1.17.0]="k8s-fedora-1.17.0@sha256:aebf67b8b1b499c721f4d98a7ab9542c680553a14cbc144d1fa701fe611f3c0d"
     IMAGES[k8s-1.18]="k8s-1.18@sha256:906af927cd0a998166d12c61162db2a0eb395c9e65d537ce7d1af2d603cb8690"
     IMAGES[k8s-1.17]="k8s-1.17@sha256:c60f8450457d0678c40247abaad6a687cc6cfe1c1ac307291ae4008f1c490240"
-    IMAGES[k8s-1.16]="k8s-1.16@sha256:cbcd3783f64f4f74610378eee52221249b265dfb55086258f5b442aa8f6d8721"
-    IMAGES[k8s-1.15]="k8s-1.15@sha256:9fc04146bb44f3e659970c4599b7f513d8bd72e6d644c3da5640327a121f40cf"
-    IMAGES[k8s-1.14]="k8s-1.14@sha256:7cd5c575d9da458e8b8d2bf05d826f28984ba039917898a12e4331934465001c"
+    IMAGES[k8s-1.16]="k8s-1.16@sha256:1e153fb62c9a30ce6bc6ddc1af21bb28a56b780ec93ab15e113d729bf664469a"
+    IMAGES[k8s-1.15]="k8s-1.15@sha256:c58cb9d79968590f24e070bc2517088d44fa2f83ba73e989a7e0f690ad08460b"
+    IMAGES[k8s-1.14]="k8s-1.14@sha256:46e449b292dcb420f0944cac0a7a5c667c6f19bba2a4192737380e8e77f27ed0"
     IMAGES[okd-4.1]="okd-4.1@sha256:e7e3a03bb144eb8c0be4dcd700592934856fb623d51a2b53871d69267ca51c86"
     IMAGES[okd-4.2]="okd-4.2@sha256:a830064ca7bf5c5c2f15df180f816534e669a9a038fef4919116d61eb33e84c5"
     IMAGES[okd-4.3]="okd-4.3@sha256:63abc3884002a615712dfac5f42785be864ea62006892bf8a086ccdbca8b3d38"

diff --git a/cluster-up/version.txt b/cluster-up/version.txt
@@ -1 +1 @@
-20ad549debfd16eb911c0149bdb15ffbd7188e13
+bbc2f3af3cae1868981aaa9173512d05740cadcc
diff --git a/hack/config-default.sh b/hack/config-default.sh
@@ -11,7 +11,7 @@ cdi_namespace=cdi
 image_pull_policy=${IMAGE_PULL_POLICY:-IfNotPresent}
 verbosity=${VERBOSITY:-2}
 package_name=${PACKAGE_NAME:-kubevirt-dev}
-kubevirtci_git_hash="20ad549debfd16eb911c0149bdb15ffbd7188e13"
+kubevirtci_git_hash="bbc2f3af3cae1868981aaa9173512d05740cadcc"
 
 # try to derive csv_version from docker tag. But it must start with x.y.z, without leading v
 default_csv_version="${docker_tag/latest/0.0.0}"

diff --git a/pkg/host-disk/host-disk.go b/pkg/host-disk/host-disk.go
@@ -90,9 +90,12 @@ func dirBytesAvailable(path string) (uint64, error) {
 
 func createSparseRaw(fullPath string, size int64) error {
 	offset := size - 1
-	f, _ := os.Create(fullPath)
+	f, err := os.Create(fullPath)
 	defer f.Close()
-	_, err := f.WriteAt([]byte{0}, offset)
+	if err != nil {
+		return err
+	}
+	_, err = f.WriteAt([]byte{0}, offset)
 	if err != nil {
 		return err
 	}
@@ -166,12 +169,14 @@ func (hdc DiskImgCreator) Create(vmi *v1.VirtualMachineInstance) error {
 				}
 				err = createSparseRaw(diskPath, int64(diskSize))
 				if err != nil {
+					log.Log.Reason(err).Errorf("Couldn't create a sparse raw file for disk path: %s, error: %v", diskPath, err)
 					return err
 				}
 			} else if err != nil {
 				return err
 			}
 			if err := ephemeraldiskutils.DefaultOwnershipManager.SetFileOwnership(diskPath); err != nil {
+				log.Log.Reason(err).Errorf("Couldn't set Ownership on %s: %v", diskPath, err)
 				return err
 			}
 		}

diff --git a/tests/utils.go b/tests/utils.go
@@ -267,7 +267,7 @@ const (
 	osAuditLogPath  = "/var/lib/origin/audit-ocp.log"
 	swaggerPath     = "api/openapi-spec/swagger.json"
 	artifactsEnv    = "ARTIFACTS"
-	tmpPath         = "/tmp/kubevirt.io/tests"
+	tmpPath         = "/provision/kubevirt.io/tests"
 )
 
 const (
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		474b7fc29313416d0672e78e4c65a842e01b2c59
		48988e0253c73c9b0c6e3fdd484c76dadbe12826
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		20ad549debfd16eb911c0149bdb15ffbd7188e13
		bbc2f3af3cae1868981aaa9173512d05740cadcc