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

test: extract GenerateCIArtifactName to test helpers

Browse source 
A bit of deduplication can never hurt.

Signed-off-by: Ondřej Budai <ondrej@budai.cz>
This commit is contained in:
Ondřej Budai 2020-11-30 10:50:42 +01:00 • committed by msehnout
parent 9f80c2ac8e
commit 18258238d9
3 changed files with 24 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

17
cmd/cloud-cleaner/main.go
View file

@ -4,10 +4,11 @@ package main
import (
"fmt"
"os"
"github.com/Azure/go-autorest/autorest/azure/auth"
"github.com/osbuild/osbuild-composer/internal/boot/azuretest"
"github.com/osbuild/osbuild-composer/internal/test"
)
func panicErr(err error) {
@ -22,19 +23,7 @@ func printErr(err error) {
}
}
// GenerateCIArtifactName generates a new identifier for CI artifacts which is based
// on environment variables specified by Jenkins
// note: in case of migration to sth else like Github Actions, change it to whatever variables GH Action provides
func GenerateCIArtifactName(prefix string) (string, error) {
distroCode := os.Getenv("DISTRO_CODE")
branchName := os.Getenv("BRANCH_NAME")
buildId := os.Getenv("BUILD_ID")
if branchName == "" || buildId == "" || distroCode == "" {
return "", fmt.Errorf("The environment variables must specify BRANCH_NAME, BUILD_ID, and DISTRO_CODE")
}
return fmt.Sprintf("%s%s-%s-%s", prefix, distroCode, branchName, buildId), nil
}
func main() {
fmt.Println("Running a cloud cleanup")
@ -46,7 +35,7 @@ func main() {
panic("empty credentials")
}
// Get test ID
testID, err := GenerateCIArtifactName("")
testID, err := test.GenerateCIArtifactName("")
panicErr(err)
// Delete the vhd image
imageName := "image-" + testID + ".vhd"