Merge pull request #81 from markusewalker/markus/task-1643

Automate private registry tests that are done for release testing

Dockerfile

@@ -25,6 +25,7 @@ ARG RANCHER2_KEY_PATH
 ARG RKE_KEY_PATH
 ARG SANITY_KEY_PATH
 ARG AIRGAP_KEY_PATH
+ARG REGISTRY_KEY_PATH
 
 ENV QASE_TEST_RUN_ID=${QASE_TEST_RUN_ID}
 ENV TERRAFORM_VERSION=${TERRAFORM_VERSION}
@@ -38,6 +39,7 @@ ENV RANCHER2_KEY_PATH=${RANCHER2_KEY_PATH}
 ENV RKE_KEY_PATH=${RKE_KEY_PATH}
 ENV SANITY_KEY_PATH=${SANITY_KEY_PATH}
 ENV AIRGAP_KEY_PATH=${AIRGAP_KEY_PATH}
+ENV REGISTRY_KEY_PATH=${REGISTRY_KEY_PATH}
 
 RUN wget https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_linux_amd64.zip -q && apt-get update > /dev/null && apt-get install unzip > /dev/null && \
     unzip terraform_${TERRAFORM_VERSION}_linux_amd64.zip > /dev/null && \ 

build.sh

@@ -15,6 +15,7 @@ RANCHER2_KEY_PATH="${RANCHER2_KEY_PATH:-}"
 RKE_KEY_PATH="${RKE_KEY_PATH:-}"
 SANITY_KEY_PATH="${SANITY_KEY_PATH:-}"
 AIRGAP_KEY_PATH="${AIRGAP_KEY_PATH:-}"
+REGISTRY_KEY_PATH="${REGISTRY_KEY_PATH:-}"
 
 TRIM_JOB_NAME=$(basename "$JOB_NAME")
 
@@ -35,6 +36,7 @@ while [[ 3 -gt $count ]]; do
                                                                     --build-arg RKE_KEY_PATH="$RKE_KEY_PATH" \
                                                                     --build-arg SANITY_KEY_PATH="$SANITY_KEY_PATH" \
                                                                     --build-arg AIRGAP_KEY_PATH="$AIRGAP_KEY_PATH" \
+                                                                    --build-arg REGISTRY_KEY_PATH="$REGISTRY_KEY_PATH" \
                                                                     --build-arg EXTERNAL_ENCODED_VPN="$EXTERNAL_ENCODED_VPN" \
                                                                     --build-arg VPN_ENCODED_LOGIN="$VPN_ENCODED_LOGIN" \
                                                                     -t tfp-automation-validation-"${TRIM_JOB_NAME}""${BUILD_NUMBER}"

config/config.go

@@ -50,6 +50,13 @@ var WorkerNodePool = Nodepool{
 	Quantity:     1,
 }
 
+var AllRolesNodePool = Nodepool{
+	Etcd:         true,
+	Controlplane: true,
+	Worker:       true,
+	Quantity:     1,
+}
+
 var ScaleUpEtcdNodePool = Nodepool{
 	Etcd:         true,
 	Controlplane: false,

config/nodeproviders/aws/awsConfig.go

@@ -1,21 +1,22 @@
 package aws
 
 type Config struct {
-	AMI                   string   `json:"ami,omitempty" yaml:"ami,omitempty"`
-	AWSInstanceType       string   `json:"awsInstanceType,omitempty" yaml:"awsInstanceType,omitempty"`
-	AWSKeyName            string   `json:"awsKeyName,omitempty" yaml:"awsKeyName,omitempty"`
-	AWSRootSize           int64    `json:"awsRootSize,omitempty" yaml:"awsRootSize,omitempty"`
-	AWSSecurityGroupNames []string `json:"awsSecurityGroupNames,omitempty" yaml:"awsSecurityGroupNames,omitempty"`
-	AWSSecurityGroups     []string `json:"awsSecurityGroups,omitempty" yaml:"awsSecurityGroups,omitempty"`
-	AWSSubnetID           string   `json:"awsSubnetID,omitempty" yaml:"awsSubnetID,omitempty"`
-	AWSSubnets            []string `json:"awsSubnets,omitempty" yaml:"awsSubnets,omitempty"`
-	AWSVpcID              string   `json:"awsVpcID,omitempty" yaml:"awsVpcID,omitempty"`
-	AWSRoute53Zone        string   `json:"awsRoute53Zone,omitempty" yaml:"awsRoute53Zone,omitempty"`
-	AWSZoneLetter         string   `json:"awsZoneLetter,omitempty" yaml:"awsZoneLetter,omitempty"`
-	PrivateAccess         bool     `json:"privateAccess,omitempty" yaml:"privateAccess,omitempty"`
-	PublicAccess          bool     `json:"publicAccess,omitempty" yaml:"publicAccess,omitempty"`
-	RegistryRootSize      int64    `json:"registryRootSize,omitempty" yaml:"registryRootSize,omitempty"`
-	Region                string   `json:"region,omitempty" yaml:"region,omitempty"`
-	AWSUser               string   `json:"awsUser,omitempty" yaml:"awsUser,omitempty"`
-	Timeout               string   `json:"timeout,omitempty" yaml:"timeout,omitempty"`
+	AMI                          string   `json:"ami,omitempty" yaml:"ami,omitempty"`
+	AWSInstanceType              string   `json:"awsInstanceType,omitempty" yaml:"awsInstanceType,omitempty"`
+	AWSKeyName                   string   `json:"awsKeyName,omitempty" yaml:"awsKeyName,omitempty"`
+	AWSRootSize                  int64    `json:"awsRootSize,omitempty" yaml:"awsRootSize,omitempty"`
+	AWSSecurityGroupNames        []string `json:"awsSecurityGroupNames,omitempty" yaml:"awsSecurityGroupNames,omitempty"`
+	AWSSecurityGroups            []string `json:"awsSecurityGroups,omitempty" yaml:"awsSecurityGroups,omitempty"`
+	AWSSubnetID                  string   `json:"awsSubnetID,omitempty" yaml:"awsSubnetID,omitempty"`
+	AWSSubnets                   []string `json:"awsSubnets,omitempty" yaml:"awsSubnets,omitempty"`
+	AWSVpcID                     string   `json:"awsVpcID,omitempty" yaml:"awsVpcID,omitempty"`
+	AWSRoute53Zone               string   `json:"awsRoute53Zone,omitempty" yaml:"awsRoute53Zone,omitempty"`
+	AWSZoneLetter                string   `json:"awsZoneLetter,omitempty" yaml:"awsZoneLetter,omitempty"`
+	PrivateAccess                bool     `json:"privateAccess,omitempty" yaml:"privateAccess,omitempty"`
+	PublicAccess                 bool     `json:"publicAccess,omitempty" yaml:"publicAccess,omitempty"`
+	RegistryRootSize             int64    `json:"registryRootSize,omitempty" yaml:"registryRootSize,omitempty"`
+	Region                       string   `json:"region,omitempty" yaml:"region,omitempty"`
+	StandaloneSecurityGroupNames []string `json:"standaloneSecurityGroupNames,omitempty" yaml:"standaloneSecurityGroupNames,omitempty"`
+	AWSUser                      string   `json:"awsUser,omitempty" yaml:"awsUser,omitempty"`
+	Timeout                      string   `json:"timeout,omitempty" yaml:"timeout,omitempty"`
 }

framework/cleanup/rke/cleanup.go → framework/cleanup/cleanup.go

@@ -1,4 +1,4 @@
-package rke
+package cleanup
 
 import (
 	"testing"
@@ -9,13 +9,13 @@ import (
 	"github.com/rancher/tfp-automation/defaults/configs"
 )
 
-// ConfigRKECleanup is a function that will run terraform destroy and cleanup Terraform resources.
-func ConfigRKECleanup(t *testing.T, terraformOptions *terraform.Options) {
+// Cleanup is a function that will run terraform destroy and cleanup Terraform resources.
+func Cleanup(t *testing.T, terraformOptions *terraform.Options, keyPath string) {
 	rancherConfig := new(rancher.Config)
 	config.LoadConfig(configs.Rancher, rancherConfig)
 
 	if *rancherConfig.Cleanup {
 		terraform.Destroy(t, terraformOptions)
-		ConfigRKECleanupTF()
+		TFFilesCleanup(keyPath)
 	}
 }

framework/cleanup/rancher2/cleanupConfigTF.go → framework/cleanup/cleanupConfig.go

@@ -1,21 +1,17 @@
-package rancher2
+package cleanup
 
 import (
 	"os"
 
 	"github.com/rancher/tfp-automation/defaults/configs"
-	resources "github.com/rancher/tfp-automation/framework/set/resources/rancher2"
 	"github.com/sirupsen/logrus"
 )
 
-// ConfigCleanupTF is a function that will cleanup the main.tf file and terraform.tfstate files.
-func ConfigCleanupTF() error {
-	keyPath := resources.SetKeyPath()
-
+// TFFilesCleanup is a function that will cleanup the main.tf file and terraform.tfstate files.
+func TFFilesCleanup(keyPath string) error {
 	file, err := os.Create(keyPath + configs.MainTF)
 	if err != nil {
 		logrus.Errorf("Failed to overwrite main.tf file. Error: %v", err)
-
 		return err
 	}
 
@@ -24,7 +20,6 @@ func ConfigCleanupTF() error {
 	_, err = file.WriteString("// Leave blank - main.tf will be set during testing")
 	if err != nil {
 		logrus.Errorf("Failed to write to main.tf file. Error: %v", err)
-
 		return err
 	}
 
@@ -36,15 +31,13 @@ func ConfigCleanupTF() error {
 
 		if err != nil {
 			logrus.Errorf("Failed to delete terraform.tfstate, terraform.tfstate.backup, and terraform.lock.hcl files. Error: %v", err)
-
 			return err
 		}
 	}
 
 	err = os.RemoveAll(keyPath + configs.TerraformFolder)
 	if err != nil {
 		logrus.Errorf("Failed to delete .terraform folder. Error: %v", err)
-
 		return err
 	}