From patchwork Mon Apr 17 21:33:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Biggers X-Patchwork-Id: 9684561 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 27789600F6 for ; Mon, 17 Apr 2017 21:34:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 17D1E212BE for ; Mon, 17 Apr 2017 21:34:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0C86528236; Mon, 17 Apr 2017 21:34:23 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 94AE3212BE for ; Mon, 17 Apr 2017 21:34:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754307AbdDQVeW (ORCPT ); Mon, 17 Apr 2017 17:34:22 -0400 Received: from mail-pf0-f193.google.com ([209.85.192.193]:35967 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753250AbdDQVeV (ORCPT ); Mon, 17 Apr 2017 17:34:21 -0400 Received: by mail-pf0-f193.google.com with SMTP id i5so27067022pfc.3 for ; Mon, 17 Apr 2017 14:34:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=eV2Let71Wk6K70ZH5f5tlZY0vq0BmACf8Ld997Hm+IU=; b=XnRIiIBOBn7vOn3AOxXU8xezHB3EE0heNmO1SS715ZS/2HRRAyrIf8ERim4UIaCOBs JggWP0gINYCHzy93zABNYyYUwCY+6oblxx6cYs+TQTcJbMNirScfzSE3o8k/H+CkwCnR b3Mfp2nBMQGOrIv29yhs5Iasgy82tMADFPAwcSUNMTwwnza5QL+ZCUfuOwJI0z4HPhcj DVnq2XTSpwSFbNWmdy7JDR/1Yb9IIw/xsD2OuXXb+B7bm7QXIs8Q/M/pjmKqJOU5eYJs W/7Wp+YbUmxLkA6qQvE9G321WOcPtD2LGutChRQZDi++ooW47PSWcSxfliOap2/Da5uQ tZwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=eV2Let71Wk6K70ZH5f5tlZY0vq0BmACf8Ld997Hm+IU=; b=gKkpZdSXzqnvG1DEu1bLtF8QL++LJp4rnUAsf/fVt/U6RkaZJPJ1rG3lmhpoGnvvai xk4ayPTQX109UyUQMaQtZvmsg93L/J1Tvua62VvqFjUkrd8tYvFftTWWm+V/Ras8voL9 q2SyJY0oeMSaey2e68qz2LmIeWLWlnxPr0uCrxkbihsDtyt53rtCYxolFn/+pYwAh5OP Hn9/IBYc/RNhs3GNfAo5I7S/W+NkrCKekzd6v93jw7BZmq6scq5Uu6+Wj4yrF98hTYfn z3YBCwgrmVAs4Lew0p1czwzHu14j1VVkLFM5LPxQwbtujsRC1KWg+ho1RHcPaeRUXtua j8yg== X-Gm-Message-State: AN3rC/4++b951vzof6qhNoldV3cJ4wCKF2V3/52B0Am3J7RcjCkZZuVO wXj8bpB4jvwOIg== X-Received: by 10.98.223.5 with SMTP id u5mr14205664pfg.147.1492464860845; Mon, 17 Apr 2017 14:34:20 -0700 (PDT) Received: from ebiggers-linuxstation.kir.corp.google.com ([100.119.30.131]) by smtp.gmail.com with ESMTPSA id r73sm6869012pfa.65.2017.04.17.14.34.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 17 Apr 2017 14:34:20 -0700 (PDT) From: Eric Biggers To: Theodore Ts'o Cc: fstests@vger.kernel.org, Eric Biggers Subject: [PATCH 2/3] gce-xfstests: move NR_CPU, MEM, and ROOT_FS into config.gce Date: Mon, 17 Apr 2017 14:33:26 -0700 Message-Id: <20170417213327.36520-2-ebiggers3@gmail.com> X-Mailer: git-send-email 2.12.2.762.g0e3151a226-goog In-Reply-To: <20170417213327.36520-1-ebiggers3@gmail.com> References: <20170417213327.36520-1-ebiggers3@gmail.com> Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Eric Biggers This allows them to be overridden by ~/.config/gce-xfstests. Signed-off-by: Eric Biggers --- Documentation/gce-xfstests.md | 12 +++++++----- kvm-xfstests/config.gce | 12 ++++++++++++ kvm-xfstests/gce-xfstests | 9 --------- 3 files changed, 19 insertions(+), 14 deletions(-) diff --git a/Documentation/gce-xfstests.md b/Documentation/gce-xfstests.md index 6d053d1..5b1c9a7 100644 --- a/Documentation/gce-xfstests.md +++ b/Documentation/gce-xfstests.md @@ -345,8 +345,10 @@ variable is defined: GCE_IMAGE_PROJECT="$GCE_PROJECT" Normally, the most recently created image in the xfstests image family -will be used by default. You can however override this by using the --I option to specify a specific image file. (For example: -"gce-xfstests -I xfstests-201608130052 smoke".) You can also use the ---image-project command line option to override the GCE_IMAGE_PROJECT -setting in your configuration file. +will be used by default. You can however override this and use a +specific image by setting `ROOT_FS` in your `~/.config/gce-xfstests` +configuration file, or by using the -I option to gce-xfstests. (For +example: `ROOT_FS=xfstests-201608130052`, or "gce-xfstests -I +xfstests-201608130052 smoke".) You can also use the --image-project +command line option to override the GCE_IMAGE_PROJECT setting in your +configuration file. diff --git a/kvm-xfstests/config.gce b/kvm-xfstests/config.gce index 96b64f8..3358ae3 100644 --- a/kvm-xfstests/config.gce +++ b/kvm-xfstests/config.gce @@ -13,3 +13,15 @@ # List of firewall rules to create. By default the gce-xfstests web interface # is made available to everyone over the public Internet. GCE_FIREWALL_RULES=("allow-http --allow tcp:80 --target-tags http-server") + +# Use different defaults for GCE because the background ruby monitoring +# program uses extra memory --- the n1-standard-2 machine type has 7.5 GB, +# so use that. +NR_CPU=2 +MEM=7680 + +# Name of the GCE image from which the test instances will be created. +# This can also be set by the -I option. +# If "xfstests" (the default), this is actually treated as an image family, and +# the latest image from the xfstests family will be used. +ROOT_FS="xfstests" diff --git a/kvm-xfstests/gce-xfstests b/kvm-xfstests/gce-xfstests index 7b678bc..240467e 100755 --- a/kvm-xfstests/gce-xfstests +++ b/kvm-xfstests/gce-xfstests @@ -9,15 +9,6 @@ fi . "$DIR/util/get-config" -# Use different defaults for GCE because the background ruby monitoring -# program uses extra memory --- the n1-standard-2 machine type has 7.5 GB, -# so use that. -NR_CPU=2 -MEM=7680 - -# We use ROOT_FS for the GCE image; this can be set by the -I option -ROOT_FS="xfstests" - if test -r "$DIR/test-appliance/config.custom" ; then . "$DIR/test-appliance/config.custom" fi