test: Add 'latestReleasedVersion' target to Jenkins jobs (#2133)

* adding currentVersion to jenkinsfile and updating some tests to use it

* logging

* renaming 'current' to 'latestReleasedVersion' and updating bad test definitions

* fixing null deref

* removing skipping of tests

* testing simplified version checking logic

* fixup

* fixup

* uncommenting line to skip tests
This commit is contained in:
Mark Rossetti 2019-10-11 08:08:30 -07:00 коммит произвёл Azure Kubernetes Service Bot
Родитель 9e3fb3b598
Коммит 3b5d03b67d
7 изменённых файлов: 27 добавлений и 6 удалений

16
Jenkinsfile поставляемый
Просмотреть файл

@ -6,6 +6,7 @@ defaultEnv = [
] + params
def k8sVersions = ["1.12", "1.13", "1.14", "1.15", "1.16"]
def latestReleasedVersion = "1.16"
def tasks = [:]
def testConfigs = []
@ -151,11 +152,20 @@ stage ("discover tests") {
return // this is a continue and will not exit the entire iteration
}
def isAllowedVersion = jobCfg.options?.allowedOrchestratorVersions == null ? true : version in jobCfg.options.allowedOrchestratorVersions
if(!isAllowedVersion) {
// run the job if:
// allowedOrchestratorVersions is not set OR
// allowedOrchestratorVersions contains version being processed OR
// (version being process equals latestReleasedVersion AND allowedOrchestratorVersions contains "latestReleasedVersion")
def allowedVersions = jobCfg.options?.allowedOrchestratorVersions
def isVersionAllowed = allowedVersions == null ? true : version in allowedVersions
isVersionAllowed |= version == latestReleasedVersion && allowedVersions && "latestReleasedVersion" in allowedVersions
if(!isVersionAllowed) {
// the job config has limited this job to not run for this verion of the orchestrator
echo("${jobName} is limited to ${jobCfg.options?.allowedOrchestratorVersions}; not running ${version}")
echo("${jobName} is limited to ${jobCfg.options?.allowedOrchestratorVersions}; not running for ${version}")
return // this is a continue and will not exit the entire iteration
} else {
echo("${jobName} is limted to '${jobCfg.options?.allowedOrchestratorVersions}'; running for ${version}")
}
if(params.UPGRADE_CLUSTER) {

Просмотреть файл

@ -1,9 +1,9 @@
{
"env": {
"allowedOrchestratorVersions": ["1.16"],
"SKIP_TEST": "true"
},
"options": {
"allowedOrchestratorVersions": ["latestReleasedVersion"],
"clientId": "AKS_ENGINE_9251926c_CLIENT_ID",
"clientSecret": "AKS_ENGINE_9251926c_CLIENT_SECRET"
},

Просмотреть файл

@ -1,9 +1,9 @@
{
"env": {
"allowedOrchestratorVersions": ["1.16"],
"SKIP_TEST": "true"
},
"options": {
"allowedOrchestratorVersions": ["latestReleasedVersion"],
"clientId": "AKS_ENGINE_e7b1dca4_CLIENT_ID",
"clientSecret": "AKS_ENGINE_e7b1dca4_CLIENT_SECRET"
},

Просмотреть файл

@ -1,5 +1,7 @@
{
"env": {},
"options": {
"allowedOrchestratorVersions": ["latestReleasedVersion"]
},
"apiModel": {
"apiVersion": "vlabs",
"properties": {

Просмотреть файл

@ -4,6 +4,9 @@
"WINDOWS_NODE_IMAGE_NAME": "WS2019-1908",
"WINDOWS_NODE_IMAGE_RESOURCE_GROUP": "acse-test-infrastructure"
},
"options": {
"allowedOrchestratorVersions": ["latestReleasedVersion"]
},
"apiModel": {
"apiVersion": "vlabs",
"properties": {

Просмотреть файл

@ -7,6 +7,9 @@
"WINDOWS_NODE_IMAGE_SUBSCRIPTION_ID": "3014546b-7d1c-4f80-8523-f24a9976fe6a",
"WINDOWS_NODE_IMAGE_VERSION": "17763.678.190826"
},
"options": {
"allowedOrchestratorVersions": ["latestReleasedVersion"]
},
"apiModel": {
"apiVersion": "vlabs",
"properties": {

Просмотреть файл

@ -3,6 +3,9 @@
"REGION_OPTIONS": "westus",
"WINDOWS_NODE_VHD_URL": "https://aksenginee2etestimages.blob.core.windows.net/vhds/WS2019-1908.vhd"
},
"options": {
"allowedOrchestratorVersions": ["latestReleasedVersion"]
},
"apiModel": {
"apiVersion": "vlabs",
"properties": {