Skip to content

Fixing Appco fleet and neuvector failing tests #743

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

Open
lscalabrini01 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fixing Appco fleet and neuvector failing tests #743

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
e42b944
feat: Fixing Appco fleet and neuvector failing tests
lscalabrini01 Jun 26, 2026
d5d563e
feat: Fixing Password must be at least 12 characters error
lscalabrini01 Jun 29, 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
18 changes: 10 additions & 8 deletions validation/Jenkinsfile.e2e
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@
def libraryBranch = env.QA_JENKINS_LIBRARY_BRANCH ?: 'main'
library "qa-jenkins-library@${libraryBranch}"

def DEFAULT_RANCHER_PASSWORD = 'X%S3bPyg@n8kWcRs675l#fH0'

/**
* Shared teardown helper: re-renders tfvars from params, tears down tofu workspace
* via make infra-down AUTO_APPROVE=yes.
Expand Down Expand Up @@ -155,12 +157,12 @@ pipeline {
)
password(
name: 'RANCHER_BOOTSTRAP_PASSWORD',
defaultValue: 'rancherrocks',
defaultValue: DEFAULT_RANCHER_PASSWORD,
description: 'Rancher bootstrap password for initial setup'
)
password(
name: 'RANCHER_ADMIN_PASSWORD',
defaultValue: 'rancherrocks',
defaultValue: DEFAULT_RANCHER_PASSWORD,
description: 'Rancher admin password after bootstrap'
)
booleanParam(
Expand Down Expand Up @@ -622,8 +624,8 @@ insecure = true'''
content: params.ANSIBLE_VARIABLES,
envVars: [
'RKE2_VERSION': params.RKE2_VERSION,
'RANCHER_BOOTSTRAP_PASSWORD': params.RANCHER_BOOTSTRAP_PASSWORD ?: 'rancherrocks',
'RANCHER_ADMIN_PASSWORD': params.RANCHER_ADMIN_PASSWORD ?: 'rancherrocks',
'RANCHER_BOOTSTRAP_PASSWORD': params.RANCHER_BOOTSTRAP_PASSWORD ?: DEFAULT_RANCHER_PASSWORD,
'RANCHER_ADMIN_PASSWORD': params.RANCHER_ADMIN_PASSWORD ?: DEFAULT_RANCHER_PASSWORD,
'RANCHER_VERSION': params.RANCHER_VERSION,
'RANCHER_IMAGE_TAG': params.RANCHER_IMAGE_TAG ?: 'head',
'RANCHER_CHART_REPO_URL': rancherChartRepoUrlParam
Expand All @@ -642,8 +644,8 @@ rancher_use_bundled_system_charts: true
envVars: [
'DEPLOY_RANCHER_ANSIBLE': params.DEPLOY_RANCHER ? 'true' : 'false',
'HOSTNAME_PREFIX': params.HOSTNAME_PREFIX,
'RANCHER_BOOTSTRAP_PASSWORD': params.RANCHER_BOOTSTRAP_PASSWORD ?: 'rancherrocks',
'RANCHER_ADMIN_PASSWORD': params.RANCHER_ADMIN_PASSWORD ?: 'rancherrocks',
'RANCHER_BOOTSTRAP_PASSWORD': params.RANCHER_BOOTSTRAP_PASSWORD ?: DEFAULT_RANCHER_PASSWORD,
'RANCHER_ADMIN_PASSWORD': params.RANCHER_ADMIN_PASSWORD ?: DEFAULT_RANCHER_PASSWORD,
'RANCHER_IMAGE_TAG': params.RANCHER_IMAGE_TAG ?: 'head'
]
)
Expand Down Expand Up @@ -751,7 +753,7 @@ rancher_use_bundled_system_charts: true
'AWS_ACCESS_KEY_ID': env.AWS_ACCESS_KEY_ID,
'AWS_SECRET_ACCESS_KEY': env.AWS_SECRET_ACCESS_KEY,
'HOSTNAME_PREFIX': params.HOSTNAME_PREFIX,
'ADMIN_PASSWORD': params.RANCHER_ADMIN_PASSWORD ?: 'rancherrocks'
'ADMIN_PASSWORD': params.RANCHER_ADMIN_PASSWORD ?: DEFAULT_RANCHER_PASSWORD
]
)
writeFile file: "${env.TESTS_DIR}/cattle-config.yaml", text: resolvedConfig.trim() + '\n'
Expand Down Expand Up @@ -864,7 +866,7 @@ rancher_use_bundled_system_charts: true
}
if (!adminToken) {
echo 'WARNING: No admin token available — using RANCHER_ADMIN_PASSWORD as fallback'
adminToken = params.RANCHER_ADMIN_PASSWORD ?: 'rancherrocks'
adminToken = params.RANCHER_ADMIN_PASSWORD ?: DEFAULT_RANCHER_PASSWORD
}

def rancherUrl = "https://${params.HOSTNAME_PREFIX}.qa.rancher.space"
Expand Down
6 changes: 4 additions & 2 deletions validation/Jenkinsfile.multibranch.e2e
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
def libraryBranch = env.QA_JENKINS_LIBRARY_BRANCH ?: 'main'
library "qa-jenkins-library@${libraryBranch}"

def DEFAULT_RANCHER_PASSWORD = 'X%S3bPyg@n8kWcRs675l#fH0'

pipeline {
agent any

Expand Down Expand Up @@ -82,12 +84,12 @@ pipeline {
)
password(
name: 'RANCHER_BOOTSTRAP_PASSWORD',
defaultValue: 'rancherrocks',
defaultValue: DEFAULT_RANCHER_PASSWORD,
description: 'Rancher bootstrap password for initial setup'
)
password(
name: 'RANCHER_ADMIN_PASSWORD',
defaultValue: 'rancherrocks',
defaultValue: DEFAULT_RANCHER_PASSWORD,
description: 'Rancher admin password after bootstrap'
)
booleanParam(
Expand Down
2 changes: 1 addition & 1 deletion validation/charts/appco/istio.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
const (
expectedDeployLog = "deployed"
istioCanaryRevisionApp = "istiod-canary"
appCoRegistry string = `dp.apps.rancher.io`
appCoRegistry string = `oci://dp.apps.rancher.io/`
rancherIstioSecretName string = `application-collection`
istioAmbientModeSet string = `--set cni.enabled=false,ztunnel.enabled=true --set istiod.cni.enabled=false --set cni.profile=ambient,istiod.profile=ambient,ztunnel.profile=ambient`
istioGatewayModeSet string = `--set base.enabled=false,istiod.enabled=false --set gateway.enabled=true,gateway.namespaceOverride=%s`
Expand Down
5 changes: 4 additions & 1 deletion validation/charts/neuvector_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,10 @@ func (n *NeuVectorTestSuite) TestNeuVectorInstallation() {
catalogClient, err := client.GetClusterCatalogClient(n.cluster.ID)
require.NoError(n.T(), err)

err = charts.WaitChartInstall(catalogClient, actionsCharts.NeuVectorNamespace, actionsCharts.NeuVectorChartName)
n.T().Log("Waiting nuvector chart installation to complete")
err = actionsCharts.RetryOnWatchError(actionsCharts.DefaultWatchRetries, func() error {
return charts.WaitChartInstall(catalogClient, actionsCharts.NeuVectorNamespace, actionsCharts.NeuVectorChartName)
})
require.NoError(n.T(), err)
}

Expand Down
5 changes: 4 additions & 1 deletion validation/longhorn/longhorn_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,10 @@ func (l *LonghornTestSuite) TestScaleStatefulSetWithPVC() {
storage.CheckVolumeAllocation(l.T(), l.client, l.cluster.ID, namespace.Name, l.longhornTestConfig.LonghornTestStorageClass, volumeSourceName, storage.MountPath)

statefulSet.Spec.Replicas = &maxStatefulSetReplicas
statefulSet, err = extstatefulsetapi.UpdateStatefulSet(l.client, l.cluster.ID, statefulSet, true)
err = charts.RetryOnWatchError(charts.DefaultWatchRetries, func() error {
statefulSet, err = extstatefulsetapi.UpdateStatefulSet(l.client, l.cluster.ID, statefulSet, true)
return err
})
require.NoError(l.T(), err)

err = shepherdCharts.WatchAndWaitStatefulSets(l.client, l.cluster.ID, namespaceName, metav1.ListOptions{
Expand Down
Loading