Skip to content

update job to parallel individual validation job. reduce complexity of cloud validations #442

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
slickwarren merged 2 commits into from
Jan 8, 2026
Merged

update job to parallel individual validation job. reduce complexity of cloud validations #442

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
340dd3b
update job to parallel individual validation job. reduce complexity o…
invalid-email-address Jan 6, 2026
3b08339
update config.yml paths at cleanup
invalid-email-address Jan 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions actions/cloudprovider/cloudprovider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import (

"github.com/rancher/shepherd/extensions/cloudcredentials"
"github.com/rancher/shepherd/extensions/cloudcredentials/vsphere"
"github.com/rancher/shepherd/extensions/harvester"
"github.com/rancher/tests/actions/clusters"
"github.com/rancher/tests/actions/provisioninginput"
"github.com/rancher/tests/actions/secrets"
Expand Down Expand Up @@ -108,13 +107,10 @@ func CreateCloudProviderAddOns(client *rancher.Client, clustersConfig *clusters.
}

case provisioninginput.HarvesterProviderName.String():
kubeconfig, err := harvester.GetHarvesterSAKubeconfig(client, additionalData["clusterName"].(string))
if err != nil {
return clustersConfig, err
}


data := map[string][]byte{
"credential": kubeconfig,
"credential": []byte(credentials.HarvesterCredentialConfig.KubeconfigContent),
}

annotations := map[string]string{
Expand Down
70 changes: 47 additions & 23 deletions validation/pipeline/tfp/Jenkinsfile.harvester.e2e
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,7 +425,6 @@ echo "}\\n" >> "${tfvars_filepath}"

# echo "\\nEOF\\n}\\n" >> "${tfvars_filepath}"
"""

// run the test with tofu
sh """

Expand All @@ -437,40 +436,65 @@ echo "}\\n" >> "${tfvars_filepath}"
. /root/playbook.env
. ./validation/pipeline/scripts/register_downstream_cluster.sh
'

docker cp ${testContainer}-ds:/root/go/src/github.com/rancher/qa-infra-automation/config.yml mid_config.yml

docker stop ${testContainer}-ds || true; docker rm ${testContainer}-ds
sleep 90
"""
}
}
}
stage('Run Validation Tests') {

if (env.CONNECT_HARVESTER_AND_RANCHER == "true") {
try {
sh """
docker run -v ${validationVolume}:/root --name ${golangTestContainer} -t ${imageName}${TOFU_VERSION}${HARVESTER_PROVIDER_VERSION}${RANCHER2_PROVIDER_VERSION}-${commitIDTest}:${commitIDInfra} sh -c "cp \$CATTLE_TEST_CONFIG . && export CATTLE_TEST_CONFIG=/root/go/src/github.com/rancher/tests/config.yml && /root/go/bin/gotestsum --format standard-verbose --packages=${golangTestDir} --junitfile ${testResultsOut} -- -tags=${TAGS} ${GO_TEST_CASE} -timeout=${timeout} -v ;"
"""

jobs = [:]
dir("infra-repo") {
def mainRancherConfigPath = "mid_config.yml"

sh "yq e '.rancher.cleanup = true' -i ${mainRancherConfigPath}"


def configYaml = readFile(file: "${mainRancherConfigPath}")

def goProvisioningParams = [
string(name: 'TIMEOUT', value: timeout),
text(name: 'CONFIG', value: configYaml),
string(name: 'REPO', value: "${env.TEST_REPO}"),
string(name: 'BRANCH', value: "${testBranch}"),
// string(name: 'QASE_TEST_RUN_ID', value: "${testRunID}"),
string(name: 'TEST_PACKAGE', value: "${env.GO_TEST_PACKAGE}"),
string(name: 'GOTEST_TESTCASE', value: "${env.GO_TEST_CASE}"),
string(name: 'TAGS', value: "${env.TAGS}"),
]
def individualJob = "go-freeform-job-harvester"
jobs["test-pit"] = { build job: individualJob, parameters: goProvisioningParams }
parallel jobs
}

} catch (err) {
echo "${err} Test had failures.."
}

sh "docker cp ${golangTestContainer}:/root/go/src/github.com/rancher/tests/config.yml final_config.yml"

def r_host = sh (
script: "yq '.rancher.host' final_config.yml",
returnStdout: true
).trim()

def r_pass = sh (
script: "yq '.rancher.adminPassword' final_config.yml",
returnStdout: true
).trim()

def h_host = sh (
script: "yq '.harvester.host' final_config.yml",
returnStdout: true
).trim()

currentBuild.description = "https://${r_host}\\n${r_pass}\\nhttps://${h_host}\\n"
dir("infra-repo") {
def r_host = sh (
script: "yq '.rancher.host' mid_config.yml",
returnStdout: true
).trim()

def r_pass = sh (
script: "yq '.rancher.adminPassword' mid_config.yml",
returnStdout: true
).trim()

def h_host = sh (
script: "yq '.harvester.host' mid_config.yml",
returnStdout: true
).trim()
}

currentBuild.description = "https://${r_host}<br>${r_pass}<br>https://${h_host}"

sh """
docker stop ${golangTestContainer} || true
Expand Down