particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

test/azure: don't tag the resources

Browse source 
The tag is not used anymore, see the previous commits.
This commit is contained in:
Ondřej Budai 2020-07-07 11:17:39 +02:00
parent 3475c54505
commit 843f7701cf
3 changed files with 1 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cmd/osbuild-image-tests/azuretest/azure.go
View file

@ -180,7 +180,6 @@ func WithBootedImageInAzure(creds *azureCredentials, imageName, testId, publicKe
// Let's create all of them here from the test id so we can delete them
// later.
deploymentName := testId
tag := "tag-" + testId
imagePath := fmt.Sprintf("https://%s.blob.core.windows.net/%s/%s", creds.StorageAccount, creds.ContainerName, imageName)
parameters := deploymentParameters{
@ -191,7 +190,6 @@ func WithBootedImageInAzure(creds *azureCredentials, imageName, testId, publicKe
VirtualMachineName: newDeploymentParameter("vm-" + testId),
DiskName: newDeploymentParameter("disk-" + testId),
ImageName: newDeploymentParameter("image-" + testId),
Tag: newDeploymentParameter(tag),
Location: newDeploymentParameter(creds.Location),
ImagePath: newDeploymentParameter(imagePath),
AdminUsername: newDeploymentParameter("redhat"),
@ -280,7 +278,7 @@ func WithBootedImageInAzure(creds *azureCredentials, imageName, testId, publicKe
// Delete the deployment
// This actually does not delete any resources created by the
// deployment as one might think. Therefore the code above
// and the tagging are needed.
// is needed.
result, err := deploymentsClient.Delete(context.Background(), creds.ResourceGroup, deploymentName)
if err != nil {
retErr = wrapErrorf(retErr, "cannot create the request for the deployment deletion: %v", err)

1
cmd/osbuild-image-tests/azuretest/deployment.go
View file

@ -49,7 +49,6 @@ type deploymentParameters struct {
VirtualMachineName deploymentParameter `json:"virtualMachineName"`
DiskName deploymentParameter `json:"diskName"`
ImageName deploymentParameter `json:"imageName"`
Tag deploymentParameter `json:"tag"`
Location deploymentParameter `json:"location"`
ImagePath deploymentParameter `json:"imagePath"`
AdminUsername deploymentParameter `json:"adminUsername"`