WIP: add ore command to create azure gallery

cli/cli.go

@@ -60,7 +60,7 @@ func Execute(main *cobra.Command) {
 		"Alias for --log-level=DEBUG")
 
 	WrapPreRun(main, func(cmd *cobra.Command, args []string) error {
-		startLogging(cmd)
+		StartLogging(cmd)
 		return nil
 	})
 
@@ -78,7 +78,7 @@ func setRepoLogLevel(repo string, l capnslog.LogLevel) {
 	r.SetRepoLogLevel(l)
 }
 
-func startLogging(cmd *cobra.Command) {
+func StartLogging(cmd *cobra.Command) {
 	switch {
 	case logDebug:
 		logLevel = capnslog.DEBUG

cmd/kola/kola.go

@@ -134,13 +134,11 @@ func runRun(cmd *cobra.Command, args []string) {
 
 	// needs to be after RunTests() because harness empties the directory
 	if err := writeProps(); err != nil {
-		fmt.Fprintf(os.Stderr, "%v\n", err)
-		os.Exit(1)
+		plog.Fatal(err)
 	}
 
 	if runErr != nil {
-		fmt.Fprintf(os.Stderr, "%v\n", runErr)
-		os.Exit(1)
+		plog.Fatal(runErr)
 	}
 }
 

cmd/kola/options.go

@@ -124,6 +124,7 @@ func init() {
 	sv(&kola.AzureOptions.ResourceGroup, "azure-resource-group", "", "Deploy resources in an existing resource group")
 	sv(&kola.AzureOptions.AvailabilitySet, "azure-availability-set", "", "Deploy instances with an existing availibity set")
 	sv(&kola.AzureOptions.KolaVnet, "azure-kola-vnet", "", "Pass the vnet/subnet that kola is being ran from to restrict network access to created storage accounts")
+	bv(&kola.AzureOptions.TrustedLaunch, "azure-trusted-launch", false, "Enable trusted launch for VMs (default \"false\")")
 
 	// do-specific options
 	sv(&kola.DOOptions.ConfigPath, "do-config-file", "", "DigitalOcean config file (default \"~/"+auth.DOConfigPath+"\")")

cmd/ore/azure/azure.go

@@ -19,6 +19,7 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/flatcar/mantle/cli"
+	"github.com/flatcar/mantle/platform"
 	"github.com/flatcar/mantle/platform/api/azure"
 )
 
@@ -42,10 +43,12 @@ func init() {
 }
 
 func preauth(cmd *cobra.Command, args []string) error {
+	cli.StartLogging(cmd)
 	plog.Printf("Creating Azure API...")
 
 	a, err := azure.New(&azure.Options{
 		Location: azureLocation,
+		Options:  &platform.Options{},
 	})
 	if err != nil {
 		plog.Fatalf("Failed to create Azure API: %v", err)

cmd/ore/azure/create-gallery-image.go

@@ -0,0 +1,118 @@
+// Copyright 2018 CoreOS, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package azure
+
+import (
+	"encoding/json"
+	"fmt"
+	"os"
+	"path/filepath"
+	"strings"
+
+	"github.com/flatcar/mantle/platform/api/azure"
+	"github.com/flatcar/mantle/sdk"
+	"github.com/spf13/cobra"
+)
+
+var (
+	cmdCreateGalleryImage = &cobra.Command{
+		Use:   "create-gallery-image",
+		Short: "Create Azure Gallery Image",
+		Long:  "Create Azure Gallery Image mage from a VHD image",
+		RunE:  runCreateGalleryImage,
+	}
+
+	vhd              string
+	blobName         string
+	storageAccount   string
+	resourceGrp      string
+	hyperVGeneration string
+	board            string
+)
+
+func init() {
+	sv := cmdCreateGalleryImage.Flags().StringVar
+
+	sv(&imageName, "image-name", "", "image name (optional)")
+	sv(&blobName, "blob-name", "", "source blob name (optional)")
+	sv(&vhd, "file", defaultUploadFile(), "source VHD file")
+	sv(&resourceGrp, "resource-group", "", "resource group name (optional)")
+	sv(&hyperVGeneration, "hyper-v-generation", "V2", "Hyper-V generation (V2 or V1)")
+	sv(&board, "board", "amd64-usr", "board name (amd64-usr or arm64-usr)")
+	sv(&storageAccount, "storage-account", "", "storage account name (optional)")
+
+	Azure.AddCommand(cmdCreateGalleryImage)
+}
+
+func azureSanitize(name string) string {
+	name = strings.Replace(name, ".", "-", -1)
+	name = strings.Replace(name, "+", "-", -1)
+	return name
+}
+
+func runCreateGalleryImage(cmd *cobra.Command, args []string) error {
+	var err error
+	if err = api.SetupClients(); err != nil {
+		plog.Fatalf("setting up clients: %v\n", err)
+	}
+	api.Opts.Board = board
+	api.Opts.HyperVGeneration = hyperVGeneration
+
+	if blobName == "" {
+		ver, err := sdk.VersionsFromDir(filepath.Dir(vhd))
+		if err != nil {
+			plog.Fatalf("Unable to get version from image directory, provide a -blob-name flag or include a version.txt in the image directory: %v\n", err)
+		}
+		blobName = fmt.Sprintf("flatcar-dev-%s-%s", os.Getenv("USER"), ver.Version)
+	}
+	if imageName == "" {
+		imageName = azureSanitize(strings.TrimSuffix(blobName, ".vhd"))
+	}
+	if resourceGrp == "" {
+		resourceGrp, err = api.CreateResourceGroup("kola-cluster-image")
+		if err != nil {
+			plog.Fatalf("Couldn't create resource group: %v\n", err)
+		}
+	}
+	if storageAccount == "" {
+		storageAccount, err = api.CreateStorageAccount(resourceGrp)
+		if err != nil {
+			plog.Fatalf("Couldn't create storage account: %v\n", err)
+		}
+	}
+	client, err := api.GetBlobServiceClient(storageAccount)
+	if err != nil {
+		plog.Fatalf("failed to create blob service client for %q: %v", ubo.storageacct, err)
+	}
+
+	container := "vhds"
+	if err := azure.UploadBlob(client, vhd, container, blobName, true); err != nil {
+		plog.Fatalf("Uploading blob failed: %v", err)
+	}
+	blobUrl := azure.BlobURL(client, container, blobName)
+	imgID, err := api.CreateGalleryImage(imageName, resourceGrp, storageAccount, blobUrl)
+	if err != nil {
+		plog.Fatalf("Couldn't create gallery image: %v\n", err)
+	}
+	err = json.NewEncoder(os.Stdout).Encode(&struct {
+		ID *string
+	}{
+		ID: &imgID,
+	})
+	if err != nil {
+		plog.Fatalf("Couldn't encode result: %v\n", err)
+	}
+	return nil
+}

cmd/ore/azure/upload-blob.go

@@ -64,7 +64,7 @@ func init() {
 
 func defaultUploadFile() string {
 	build := sdk.BuildRoot()
-	return build + "/images/amd64-usr/latest/coreos_production_azure_image.vhd"
+	return build + "/images/amd64-usr/latest/flatcar_production_azure_image.vhd"
 }
 
 func runUploadBlob(cmd *cobra.Command, args []string) {
@@ -73,7 +73,7 @@ func runUploadBlob(cmd *cobra.Command, args []string) {
 		if err != nil {
 			plog.Fatalf("Unable to get version from image directory, provide a -blob-name flag or include a version.txt in the image directory: %v\n", err)
 		}
-		ubo.blob = fmt.Sprintf("Container-Linux-dev-%s-%s.vhd", os.Getenv("USER"), ver.Version)
+		ubo.blob = fmt.Sprintf("flatcar-dev-%s-%s.vhd", os.Getenv("USER"), ver.Version)
 	}
 
 	if err := api.SetupClients(); err != nil {

kola/harness.go

@@ -432,7 +432,7 @@ func RunTests(patterns []string, channel, offering, pltfrm, outputDir string, ss
 
 		version, err := getClusterSemver(flight, outputDir)
 		if err != nil {
-			plog.Fatal(err)
+			return fmt.Errorf("getClusterSemver: %w	", err)
 		}
 
 		// If the version is > 3033, we can safely use user-data instead of custom-data for
@@ -453,7 +453,7 @@ func RunTests(patterns []string, channel, offering, pltfrm, outputDir string, ss
 		// one more filter pass now that we know real version
 		tests, err = FilterTests(tests, patterns, channel, offering, pltfrm, *version)
 		if err != nil {
-			plog.Fatal(err)
+			return fmt.Errorf("FilterTests: %v", err)
 		}
 	}
 

kola/tests/misc/nvidia.go

@@ -3,8 +3,10 @@ package misc
 import (
 	"bytes"
 	"fmt"
+	"strings"
 	"time"
 
+	"github.com/coreos/go-semver/semver"
 	"github.com/coreos/pkg/capnslog"
 	"github.com/flatcar/mantle/kola"
 	"github.com/flatcar/mantle/kola/cluster"
@@ -28,13 +30,19 @@ func init() {
 		Platforms:     []string{"azure"},
 		Architectures: []string{"amd64"},
 		Flags:         []register.Flag{register.NoEnableSelinux},
+		SkipFunc:      skipOnNonGpu,
 	})
 }
 
-func verifyNvidiaInstallation(c cluster.TestCluster) {
-	if kola.AzureOptions.Size != "Standard_NC6s_v3" {
-		c.Skip("skipping due to wrong instance size")
+func skipOnNonGpu(version semver.Version, channel, arch, platform string) bool {
+	// N stands for GPU instance obviously :)
+	if platform == "azure" && strings.Contains(kola.AzureOptions.Size, "N") {
+		return false
 	}
+	return true
+}
+
+func verifyNvidiaInstallation(c cluster.TestCluster) {
 	m := c.Machines()[0]
 
 	nvidiaStatusRetry := func() error {

platform/api/azure/gallery-image-template.json

@@ -84,7 +84,15 @@
           {
             "name": "DiskControllerTypes",
             "value": "NVMe,SCSI"
-          }
+          },
+          {
+            "name": "SecurityType",
+            "value": "[if(equals(parameters('hyperVGeneration'), 'V2'), 'TrustedLaunchSupported', 'None')]"
+          },
+          {
+            "name": "IsAcceleratedNetworkSupported",
+	    "value": "true"
+	  }
         ]
       },
       "type": "Microsoft.Compute/galleries/images"

platform/api/azure/image.go

@@ -152,8 +152,8 @@ func (a *API) resolveImage() error {
 	if a.Opts.DiskURI != "" || a.Opts.BlobURL != "" || a.Opts.ImageFile != "" || a.Opts.Version != "" || a.Opts.Sku == "" {
 		return nil
 	}
-
-	resp, err := http.DefaultClient.Get(fmt.Sprintf("https://%s.release.flatcar-linux.net/amd64-usr/current/version.txt", a.Opts.Sku))
+	sku := strings.TrimSuffix(a.Opts.Sku, "-gen2")
+	resp, err := http.DefaultClient.Get(fmt.Sprintf("https://%s.release.flatcar-linux.net/amd64-usr/current/version.txt", sku))
 	if err != nil {
 		return fmt.Errorf("unable to fetch release bucket %v version: %v", a.Opts.Sku, err)
 	}