Drop USING_DEFAULT_FAMILY, ROOT_FS and IMAGE_FLAG from the gce config

Now that we are supporting multiple architectures, it doesn't make
sense to allow the gce-xfstests config file to specify the ROOT_FS and
IMAGE_FLAG.  The only thing that really makes sense to allow the user
to configure is the GCE_IMAGE_PROJECT.

This allows us to drop using USING_DEFAULT_FAMILY and assume that the
only thing that should be specified in the configuration file is ARCH,
and ROOT_FS and IMAGE_FLAG should be set from ARCH.

Signed-off-by: Theodore Ts'o <tytso@mit.edu>

8 files changed, 14 insertions, 34 deletions

diff --git a/run-fstests/config.gce b/run-fstests/config.gce
index 4e777813..4ec69f0b 100644
--- a/run-fstests/config.gce
+++ b/run-fstests/config.gce
@@ -24,16 +24,10 @@ GCE_NETWORK="default"
 NR_CPU=2
 MEM=7680
 
-# Name of the GCE image or image family from which the test instances
-# will be created.
-# This can also be set by the -I or --image-family options.
-# If this is not set, will default to using image family xfstests-$ARCH
-# ROOT_FS="xfstests-amd64"
-# IMAGE_FLAG="--image-family"
-
-# TODO: this is what the docs say is default behavior
-# by default, if only ROOT_FS is set, assume ROOT_F is an image
-IMAGE_FLAG="--image"
+# Name of the GCE image project where the GCE images containing the
+# test appliance can be found.  That can be overriden using the
+# --image-project option.
+GCE_IMAGE_FAMILY=xfstests-cloud
 
 ARCH="amd64"
 
diff --git a/run-fstests/config.kvm b/run-fstests/config.kvm
index f15f46fa..1d749a9f 100644
--- a/run-fstests/config.kvm
+++ b/run-fstests/config.kvm
@@ -10,8 +10,7 @@ MEM=2048
 #QEMU=/usr/local/bin/qemu-system-x86_64
 QEMU=/usr/bin/kvm
 KERNEL=$HOME/linux
-ROOT_FS=$(dirname $DIR)/test-appliance/root_fs.img
-ROOT_FS_URL="https://www.kernel.org/pub/linux/kernel/people/tytso/kvm-xfstests/root_fs.img.amd64"
+
 ROOT_DEV=/dev/vda
 VDB=$DIR/disks/vdb
 VDC=$DIR/disks/vdc
diff --git a/run-fstests/gce-xfstests b/run-fstests/gce-xfstests
index 188c307f..61057aea 100755
--- a/run-fstests/gce-xfstests
+++ b/run-fstests/gce-xfstests
@@ -678,14 +678,11 @@ SENDGRID_API_KEY="$GCE_SG_API"
     declare -p GCE_PROJECT
     declare -p GCE_IMAGE_PROJECT
     declare -p ARCH
-    declare -p USING_DEFAULT_FAMILY
     declare -p GCE_ZONE
     declare -p GCE_ZONE2
     declare -p NR_CPU
     declare -p MEM
     declare -p GS_BUCKET
-    declare -p ROOT_FS
-    declare -p IMAGE_FLAG
     declare -p BUCKET_SUBDIR
     declare -p GCE_MIN_SCR_SIZE
     declare -p GCE_LTM_KEEP_DEAD_VM
@@ -725,7 +722,7 @@ fi
 _cleanup
 trap - 0
 
-if test -n "$USING_DEFAULT_FAMILY" ; then
+if test -z "$EXPLICIT_ROOT_FS" ; then
     ROOT_FS="xfstests-$ARCH"
     IMAGE_FLAG="--image-family"
 fi
diff --git a/run-fstests/util/gce-launch-kcs b/run-fstests/util/gce-launch-kcs
index 64a94f0e..262b03b0 100755
--- a/run-fstests/util/gce-launch-kcs
+++ b/run-fstests/util/gce-launch-kcs
@@ -26,12 +26,12 @@ while (( $# >= 1 )); do
 	--image-family) shift
 	    ROOT_FS="$1"
 	    IMAGE_FLAG="--image-family"
-	    unset USING_DEFAULT_FAMILY
+	    EXPLICIT_ROOT_FS=yes
 	    ;;
 	-I) shift
 	    ROOT_FS="$1"
 	    IMAGE_FLAG="--image"
-	    unset USING_DEFAULT_FAMILY
+	    EXPLICIT_ROOT_FS=yes
 	    ;;
 	--arch) shift
 	    ARCH="$1"
@@ -50,7 +50,7 @@ if test -z "$GCE_IMAGE_PROJECT" ; then
     GCE_IMAGE_PROJECT="xfstests-cloud"
 fi
 
-if test -n "$USING_DEFAULT_FAMILY" ; then
+if test -z "$EXPLICIT_ROOT_FS" ; then
     ROOT_FS="xfstests-$ARCH"
     IMAGE_FLAG="--image-family"
 fi
diff --git a/run-fstests/util/gce-launch-ltm b/run-fstests/util/gce-launch-ltm
index dcbc4047..ee3ed693 100755
--- a/run-fstests/util/gce-launch-ltm
+++ b/run-fstests/util/gce-launch-ltm
@@ -26,12 +26,12 @@ while (( $# >= 1 )); do
 	--image-family) shift
 	    ROOT_FS="$1"
 	    IMAGE_FLAG="--image-family"
-	    unset USING_DEFAULT_FAMILY
+	    EXPLICIT_ROOT_FS=yes
 	    ;;
 	-I) shift
 	    ROOT_FS="$1"
 	    IMAGE_FLAG="--image"
-	    unset USING_DEFAULT_FAMILY
+	    EXPLICIT_ROOT_FS=yes
 	    ;;
 	--arch) shift
 	    ARCH="$1"
@@ -50,7 +50,7 @@ if test -z "$GCE_IMAGE_PROJECT" ; then
     GCE_IMAGE_PROJECT="xfstests-cloud"
 fi
 
-if test -n "$USING_DEFAULT_FAMILY" ; then
+if test -z "$EXPLICIT_ROOT_FS" ; then
     ROOT_FS="xfstests-$ARCH"
     IMAGE_FLAG="--image-family"
 fi
diff --git a/run-fstests/util/get-config b/run-fstests/util/get-config
index 07a39ab7..310f6c9b 100644
--- a/run-fstests/util/get-config
+++ b/run-fstests/util/get-config
@@ -150,10 +150,4 @@ if test "$XFSTESTS_FLAVOR" = "gce" ; then
     if test -z "$GCE_SERIAL_PORT_ACCESS" ; then
 	GCE_SERIAL_PORT_ACCESS=TRUE
     fi
-
-    if test -z "$ROOT_FS" ; then
-	ROOT_FS="xfstests-$ARCH"
-	IMAGE_FLAG="--image-family"
-	USING_DEFAULT_FAMILY="yes"
-    fi
 fi
diff --git a/run-fstests/util/parse_cli b/run-fstests/util/parse_cli
index 4631389d..2b50e04f 100644
--- a/run-fstests/util/parse_cli
+++ b/run-fstests/util/parse_cli
@@ -362,7 +362,6 @@ while (( $# >= 1 )); do
 		IMAGE_FLAG="--image"
 	    fi
 	    EXPLICIT_ROOT_FS=yes
-	    unset USING_DEFAULT_FAMILY
 	    ;;
 	-n) shift
 	    supported_flavors kvm gce
@@ -423,7 +422,6 @@ while (( $# >= 1 )); do
 	    ROOT_FS="$1"
 	    IMAGE_FLAG="--image-family"
 	    EXPLICIT_ROOT_FS=yes
-	    unset USING_DEFAULT_FAMILY
 	    ;;
 	--fail-loop-count) shift
 	    FAIL_LOOP_COUNT="$1"
diff --git a/test-appliance/gce-create-image b/test-appliance/gce-create-image
index 5dc059b1..fcef4537 100755
--- a/test-appliance/gce-create-image
+++ b/test-appliance/gce-create-image
@@ -59,10 +59,8 @@ done
 
 set_canonicalized_arch "$ARCH"
 
-if test -n "$USING_DEFAULT_FAMILY" ; then
-    ROOT_FS="xfstests-$ARCH"
-    IMAGE_FLAG="--image-family"
-fi
+ROOT_FS="xfstests-$ARCH"
+IMAGE_FLAG="--image-family"
 
 setup_for_buster()
 {