From 4dbdb567ba5ac1d2cf289e78d94e5a5d120332f9 Mon Sep 17 00:00:00 2001 From: Roberto Oliveira Date: Wed, 10 Jan 2024 10:09:31 +0100 Subject: [PATCH] Disable RHBOP main nightly and change OSL to use main branch (#1544) * disable RHBOP main nightly * change OSL nightly to use main branch * generate_status_page_data.jenkinsfile: fix not to show 1.44.2.x-prod in status page as nightly is disabled --- job-dsls/jobs/prod/prod_cron_meta_nightly_pipeline.groovy | 8 ++++---- .../job-scripts/generate_status_page_data.jenkinsfile | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/job-dsls/jobs/prod/prod_cron_meta_nightly_pipeline.groovy b/job-dsls/jobs/prod/prod_cron_meta_nightly_pipeline.groovy index 43659957..9d5de458 100644 --- a/job-dsls/jobs/prod/prod_cron_meta_nightly_pipeline.groovy +++ b/job-dsls/jobs/prod/prod_cron_meta_nightly_pipeline.groovy @@ -30,7 +30,7 @@ def KOGITO_BLUE_NEXT_PRODUCT_VERSION='1.13.2.blue' def KOGITO_BLUE_NEXT_PRODUCT_BRANCH='1.13.x-blue' def KOGITO_BLUE_NEXT_PRODUCT_CONFIG_BRANCH="kogito/1.13.x-blue" -def SERVERLESS_LOGIC_NEXT_PRODUCT_BRANCH='main-integration-quarkus-lts' +def SERVERLESS_LOGIC_NEXT_PRODUCT_BRANCH='main' def SERVERLESS_LOGIC_NEXT_PRODUCT_CONFIG_BRANCH="master" // def SERVERLESS_LOGIC_CURRENT_PRODUCT_VERSION='1.31.0' @@ -39,8 +39,8 @@ def SERVERLESS_LOGIC_NEXT_PRODUCT_CONFIG_BRANCH="master" // def SERVERLESS_LOGIC_CURRENT_PRODUCT_BRANCH='1.44.2.x-prod' // def SERVERLESS_LOGIC_CURRENT_PRODUCT_CONFIG_BRANCH="openshift-serverless-logic/1.44.2.x" -def RHBOP_NEXT_PRODUCT_BRANCH='main' -def RHBOP_NEXT_PRODUCT_CONFIG_BRANCH='master' +// def RHBOP_NEXT_PRODUCT_BRANCH='main' +// def RHBOP_NEXT_PRODUCT_CONFIG_BRANCH='master' def RHBOP_CURRENT_PRODUCT_VERSION='8.38.0' def RHBOP_CURRENT_PRODUCT_BRANCH='8.38.x-prod' @@ -87,7 +87,7 @@ pipeline{ ${serverlessLogicNightlyStage(SERVERLESS_LOGIC_NEXT_PRODUCT_BRANCH, SERVERLESS_LOGIC_NEXT_PRODUCT_CONFIG_BRANCH)} // RHBOP - ${rhbopNightlyStage(RHBOP_NEXT_PRODUCT_BRANCH, RHBOP_NEXT_PRODUCT_CONFIG_BRANCH)} + //{rhbopNightlyStage(RHBOP_NEXT_PRODUCT_BRANCH, RHBOP_NEXT_PRODUCT_CONFIG_BRANCH)} ${rhbopNightlyStage(RHBOP_CURRENT_PRODUCT_BRANCH, RHBOP_CURRENT_PRODUCT_CONFIG_BRANCH, RHBOP_CURRENT_PRODUCT_VERSION, RHBOP_CURRENT_DROOLS_VERSION)} // Drools Ansible Integration diff --git a/job-dsls/src/main/resources/job-scripts/generate_status_page_data.jenkinsfile b/job-dsls/src/main/resources/job-scripts/generate_status_page_data.jenkinsfile index 09cd972c..4379d197 100644 --- a/job-dsls/src/main/resources/job-scripts/generate_status_page_data.jenkinsfile +++ b/job-dsls/src/main/resources/job-scripts/generate_status_page_data.jenkinsfile @@ -52,7 +52,7 @@ pipeline { steps { script { dir(ghPagesRepoFolder) { - sh "build-chain-status-report --jenkinsUrl ${env.JENKINS_MASTER_URL} --jobUrl /job/PROD/job/rhba.nightly /job/PROD/job/kogito.nightly /job/PROD/job/rhbop.nightly /job/PROD/job/drools-ansible-integration.nightly -t \"Productization Jobs\" -st \"Business Automation Productization Jobs\" --certFilePath ${env[certFileGlobalVariableName]} --outputFolderPath ./data/ --skipZero -cb \"Jenkins Job\" -cu \"${env.BUILD_URL}\" -jf '^((?!7\\.59\\.x|1\\.11\\.x|1\\.24\\.x|1\\.27\\.x|1\\.30\\.x|1\\.32\\.x|1\\.35\\.x|1\\.38\\.x|1\\.40\\.x|1\\.44\\.2\\.x\\-prod|8\\.29\\.x|8\\.33\\.x).)*\$'" + sh "build-chain-status-report --jenkinsUrl ${env.JENKINS_MASTER_URL} --jobUrl /job/PROD/job/rhba.nightly /job/PROD/job/kogito.nightly /job/PROD/job/rhbop.nightly /job/PROD/job/drools-ansible-integration.nightly -t \"Productization Jobs\" -st \"Business Automation Productization Jobs\" --certFilePath ${env[certFileGlobalVariableName]} --outputFolderPath ./data/ --skipZero -cb \"Jenkins Job\" -cu \"${env.BUILD_URL}\" -jf '^((?!7\\.59\\.x|1\\.11\\.x|1\\.24\\.x|1\\.27\\.x|1\\.30\\.x|1\\.32\\.x|1\\.35\\.x|1\\.38\\.x|1\\.40\\.x|1\\.44\\.2\\.x-prod|8\\.29\\.x|8\\.33\\.x).)*\$'" } } }