diff --git a/README.md b/README.md index 624b0db04..c78727abc 100644 --- a/README.md +++ b/README.md @@ -79,8 +79,8 @@ make man ### Pull request gating Each pull request against `osbuild-composer` starts a series of automated -tests. Tests run via GitHub Actions, Travis CI, and Jenkins. Each push to -the pull request will launch theses tests automatically. +tests. Tests run via GitHub Actions and Jenkins. Each push to the pull request +will launch theses tests automatically. Jenkins only tests pull requests from members of the `osbuild` organization in GitHub. A member of the `osbuild` organization must say `ok to test` in a pull diff --git a/cmd/osbuild-image-tests/aws.go b/cmd/osbuild-image-tests/aws.go index b000bf70d..7a771a9f4 100644 --- a/cmd/osbuild-image-tests/aws.go +++ b/cmd/osbuild-image-tests/aws.go @@ -32,7 +32,7 @@ func getAWSCredentialsFromEnv() (*awsCredentials, error) { region, regionExists := os.LookupEnv("AWS_REGION") bucket, bucketExists := os.LookupEnv("AWS_BUCKET") - // Workaround Travis security feature. If non of the variables is set, just ignore the test + // If non of the variables is set, just ignore the test if !akExists && !sakExists && !bucketExists && !regionExists { return nil, nil } diff --git a/cmd/osbuild-image-tests/azuretest/azure.go b/cmd/osbuild-image-tests/azuretest/azure.go index ed27fae4c..a368d2034 100644 --- a/cmd/osbuild-image-tests/azuretest/azure.go +++ b/cmd/osbuild-image-tests/azuretest/azure.go @@ -56,7 +56,7 @@ func GetAzureCredentialsFromEnv() (*azureCredentials, error) { location, lExists := os.LookupEnv("AZURE_LOCATION") resourceGroup, rgExists := os.LookupEnv("AZURE_RESOURCE_GROUP") - // Workaround Travis security feature. If non of the variables is set, just ignore the test + // If non of the variables is set, just ignore the test if !saExists && !sakExists && !cExists && !siExists && !ciExists && !csExists && !tiExists && !lExists && !rgExists { return nil, nil } diff --git a/internal/upload/azure/azure_test.go b/internal/upload/azure/azure_test.go index e649f4b62..1018a9d2e 100644 --- a/internal/upload/azure/azure_test.go +++ b/internal/upload/azure/azure_test.go @@ -38,7 +38,7 @@ func TestAzure_FileUpload(t *testing.T) { fileName := "/tmp/testing-image.vhd" var threads int = 4 - // Workaround Travis security feature. If non of the variables is set, just ignore the test + // If non of the variables is set, just ignore the test if saExists == false && sakExists == false && cnExists == false { t.Log("No AZURE configuration provided, assuming that this is running in CI. Skipping the test.") return