Code Review
/
releng
/
global-jjb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix: Workaround for yaml multiline string
[releng/global-jjb.git]
/
jjb
/
lf-ci-jobs.yaml
diff --git
a/jjb/lf-ci-jobs.yaml
b/jjb/lf-ci-jobs.yaml
index
7759168
..
cd95e70
100644
(file)
--- a/
jjb/lf-ci-jobs.yaml
+++ b/
jjb/lf-ci-jobs.yaml
@@
-11,8
+11,8
@@
- file-id: jjbini
target: "$HOME/.config/jenkins_jobs/jenkins_jobs.ini"
- file-id: jjbini
target: "$HOME/.config/jenkins_jobs/jenkins_jobs.ini"
--
lf_packer
: &lf_packer_common
- name: lf
-packer-
common
+-
_lf_packer_common
: &lf_packer_common
+ name: lf
_packer_
common
# Provide configuration common in packer jobs.
######################
# Provide configuration common in packer jobs.
######################
@@
-30,7
+30,7
@@
submodule-disable: false
packer-builder: openstack
packer-cloud-settings: packer-cloud-env
submodule-disable: false
packer-builder: openstack
packer-cloud-settings: packer-cloud-env
- packer-version: 1.
6.6
+ packer-version: 1.
9.1
#####################
# Job Configuration #
#####################
# Job Configuration #
@@
-89,7
+89,7
@@
default: "{puppet-lint-version}"
description: Puppet-lint version to download and install.
default: "{puppet-lint-version}"
description: Puppet-lint version to download and install.
-- lf_jjb_common: &lf_jjb_common
+-
_
lf_jjb_common: &lf_jjb_common
name: lf-jjb-common
######################
name: lf-jjb-common
######################
@@
-101,7
+101,7
@@
disable-job: false
github-url: "https://github.com"
jjb-cache: "$HOME/.cache/jenkins_jobs"
disable-job: false
github-url: "https://github.com"
jjb-cache: "$HOME/.cache/jenkins_jobs"
- jjb-version:
2.8
.0
+ jjb-version:
6.0
.0
stream: master
submodule-recursive: true
submodule-timeout: 10
stream: master
submodule-recursive: true
submodule-timeout: 10
@@
-258,7
+258,7
@@
- shell: !include-raw-escape: ../shell/jenkins-configure-global-vars.sh
- shell: rm -f "$HOME/.config/jenkins_jobs/jenkins_jobs.ini"
- shell: !include-raw-escape: ../shell/jenkins-configure-global-vars.sh
- shell: rm -f "$HOME/.config/jenkins_jobs/jenkins_jobs.ini"
-- lf_jenkins_configuration: &lf_jenkins_cfg_merge
+-
_
lf_jenkins_configuration: &lf_jenkins_cfg_merge
name: lf-jenkins-cfg-merge
######################
name: lf-jenkins-cfg-merge
######################
@@
-397,7
+397,7
@@
# Jenkins Configuration Management Verify #
###########################################
# Jenkins Configuration Management Verify #
###########################################
-- lf_jenkins_configuration: &lf_jenkins_cfg_verify
+-
_
lf_jenkins_configuration: &lf_jenkins_cfg_verify
name: lf-jenkins-cfg-verify
######################
name: lf-jenkins-cfg-verify
######################
@@
-534,7
+534,7
@@
# JENKINS SANDBOX CLEANUP #
###########################
# JENKINS SANDBOX CLEANUP #
###########################
-- lf_jenkins_sandbox_cleanup: &lf_jenkins_sandbox_cleanup
+-
_
lf_jenkins_sandbox_cleanup: &lf_jenkins_sandbox_cleanup
name: lf-jenkins-sandbox-cleanup
######################
name: lf-jenkins-sandbox-cleanup
######################
@@
-586,7
+586,7
@@
# JJB DEPLOY JOB #
##################
# JJB DEPLOY JOB #
##################
-- lf_jjb_deploy_job: &lf_jjb_deploy_job
+-
_
lf_jjb_deploy_job: &lf_jjb_deploy_job
name: lf-jjb-deploy-job
######################
name: lf-jjb-deploy-job
######################
@@
-715,7
+715,7
@@
# JJB Merge #
#############
# JJB Merge #
#############
-- lf_jjb_merge: &lf_jjb_merge
+-
_
lf_jjb_merge: &lf_jjb_merge
name: lf-jjb-merge
######################
name: lf-jjb-merge
######################
@@
-824,7
+824,7
@@
# JJB Verify #
##############
# JJB Verify #
##############
-- lf_jjb_verify: &lf_jjb_verify
+-
_
lf_jjb_verify: &lf_jjb_verify
name: lf-jjb-verify
######################
name: lf-jjb-verify
######################
@@
-950,7
+950,7
@@
# JJB Verify Upstream GJJB #
############################
# JJB Verify Upstream GJJB #
############################
-- lf_jjb_verify: &lf_jjb_verify_upstream_gjjb
+-
_
lf_jjb_verify: &lf_jjb_verify_upstream_gjjb
name: lf-jjb-verify-upstream-gjjb
#####################
name: lf-jjb-verify-upstream-gjjb
#####################
@@
-1063,7
+1063,7
@@
# License Check #
#################
# License Check #
#################
-- lf_license_check: &lf_license_check
+-
_
lf_license_check: &lf_license_check
name: lf-license-check
######################
name: lf-license-check
######################
@@
-1201,7
+1201,7
@@
# Info YAML Verify #
####################
# Info YAML Verify #
####################
-- lf_info_yaml_verify: &lf_info_yaml_verify
+-
_
lf_info_yaml_verify: &lf_info_yaml_verify
name: lf-info-yaml-verify
######################
name: lf-info-yaml-verify
######################
@@
-1301,7
+1301,7
@@
# OPENSTACK CRON #
##################
# OPENSTACK CRON #
##################
-- lf_openstack_cron: &lf_openstack_cron
+-
_
lf_openstack_cron: &lf_openstack_cron
name: lf-openstack-cron
######################
name: lf-openstack-cron
######################
@@
-1372,6
+1372,12
@@
- lf-infra-pre-build
- inject:
properties-content: OS_CLOUD={openstack-cloud}
- lf-infra-pre-build
- inject:
properties-content: OS_CLOUD={openstack-cloud}
+ # K8s Clusters
+ - conditional-step:
+ condition-kind: boolean-expression
+ condition-expression: "{openstack-stack-cleanup}"
+ steps:
+ - shell: !include-raw-escape: ../shell/openstack-cleanup-orphaned-k8s-clusters.sh
# Stacks
- conditional-step:
condition-kind: boolean-expression
# Stacks
- conditional-step:
condition-kind: boolean-expression
@@
-1452,7
+1458,7
@@
# Packer Merge #
################
# Packer Merge #
################
-- lf_packer_merge: &lf_packer_merge
+-
_
lf_packer_merge: &lf_packer_merge
name: lf-packer-merge
######################
name: lf-packer-merge
######################
@@
-1570,6
+1576,10
@@
pattern: 'packer\/common-packer\/templates\/{templates}\.json'
- compare-type: REG_EXP
pattern: 'packer\/common-packer\/vars\/{platforms}\.json'
pattern: 'packer\/common-packer\/templates\/{templates}\.json'
- compare-type: REG_EXP
pattern: 'packer\/common-packer\/vars\/{platforms}\.json'
+ - compare-type: REG_EXP
+ pattern: 'packer\/common-packer\/templates\/{templates}\.hcl'
+ - compare-type: REG_EXP
+ pattern: 'packer\/common-packer\/vars\/{platforms}\.pkrvars.hcl'
- job-template:
name: "{project-name}-packer-merge-{platforms}-{templates}"
- job-template:
name: "{project-name}-packer-merge-{platforms}-{templates}"
@@
-1757,7
+1767,7
@@
# Packer Verify #
#################
# Packer Verify #
#################
-- lf_packer_verify: &lf_packer_verify
+-
_
lf_packer_verify: &lf_packer_verify
name: lf-packer-verify
######################
name: lf-packer-verify
######################
@@
-1882,7
+1892,7
@@
# Openstack Update Cloud Image #
################################
# Openstack Update Cloud Image #
################################
-- lf_openstack_cron: &lf_openstack_update_cloud_image
+-
_
lf_openstack_cron: &lf_openstack_update_cloud_image
name: lf-openstack-update-cloud-image
######################
name: lf-openstack-update-cloud-image
######################
@@
-1999,7
+2009,7
@@
# Puppet Verify #
#################
# Puppet Verify #
#################
-- lf_puppet_verify: &lf_puppet_verify
+-
_
lf_puppet_verify: &lf_puppet_verify
name: lf-puppet-verify
######################
name: lf-puppet-verify
######################
@@
-2147,7
+2157,7
@@
# Sonar #
#########
# Sonar #
#########
-- lf_sonar_common: &lf_sonar_common
+-
_
lf_sonar_common: &lf_sonar_common
name: lf-sonar-common
######################
name: lf-sonar-common
######################
@@
-2164,7
+2174,7
@@
disable-job: false
git-url: "$GIT_URL/$PROJECT"
github-url: "https://github.com"
disable-job: false
git-url: "$GIT_URL/$PROJECT"
github-url: "https://github.com"
- sonarcloud-java-version: openjdk1
1
+ sonarcloud-java-version: openjdk1
7
stream: master
submodule-recursive: true
submodule-timeout: 10
stream: master
submodule-recursive: true
submodule-timeout: 10
@@
-2176,6
+2186,7
@@
sonar-properties: ""
sonar-java-opts: ""
sonar-additional-args: ""
sonar-properties: ""
sonar-java-opts: ""
sonar-additional-args: ""
+ sonar-jdk: openjdk17
gerrit_trigger_file_paths:
- compare-type: REG_EXP
gerrit_trigger_file_paths:
- compare-type: REG_EXP
@@
-2216,7
+2227,7
@@
publishers:
- lf-infra-publish
publishers:
- lf-infra-publish
-- lf_sonar_builders: &lf_sonar_builders
+-
_
lf_sonar_builders: &lf_sonar_builders
name: lf-sonar-builders
builders:
- lf-infra-pre-build
name: lf-sonar-builders
builders:
- lf-infra-pre-build
@@
-2228,8
+2239,9
@@
sonar-properties: "{sonar-properties}"
sonar-java-opts: "{sonar-java-opts}"
sonar-additional-args: "{sonar-additional-args}"
sonar-properties: "{sonar-properties}"
sonar-java-opts: "{sonar-java-opts}"
sonar-additional-args: "{sonar-additional-args}"
+ sonar-jdk: "{sonar-jdk}"
-- lf_sonar_builders_prescan: &lf_sonar_builders_prescan
+-
_
lf_sonar_builders_prescan: &lf_sonar_builders_prescan
name: lf-sonar-builders-prescan
builders:
- lf-infra-pre-build
name: lf-sonar-builders-prescan
builders:
- lf-infra-pre-build
@@
-2242,7
+2254,7
@@
sonar-java-opts: "{sonar-java-opts}"
sonar-additional-args: "{sonar-additional-args}"
sonar-java-opts: "{sonar-java-opts}"
sonar-additional-args: "{sonar-additional-args}"
-- lf_sonar_builders_prescan_script: &lf_sonar_builders_prescan_script
+-
_
lf_sonar_builders_prescan_script: &lf_sonar_builders_prescan_script
name: lf-sonar-builders-prescan-script
builders:
- lf-infra-pre-build
name: lf-sonar-builders-prescan-script
builders:
- lf-infra-pre-build
@@
-2255,8
+2267,9
@@
sonar-properties: "{sonar-properties}"
sonar-java-opts: "{sonar-java-opts}"
sonar-additional-args: "{sonar-additional-args}"
sonar-properties: "{sonar-properties}"
sonar-java-opts: "{sonar-java-opts}"
sonar-additional-args: "{sonar-additional-args}"
+ sonar-jdk: "{sonar-jdk}"
-- lf_sonar_gerrit_common: &lf_sonar_gerrit_common
+-
_
lf_sonar_gerrit_common: &lf_sonar_gerrit_common
name: lf-sonar-gerrit-common
gerrit_sonar_triggers:
- comment-added-contains-event:
name: lf-sonar-gerrit-common
gerrit_sonar_triggers:
- comment-added-contains-event:
@@
-2291,7
+2304,7
@@
unstable: true
notbuilt: true
unstable: true
notbuilt: true
-- lf_sonar_github_common: &lf_sonar_github_common
+-
_
lf_sonar_github_common: &lf_sonar_github_common
name: lf-sonar-github-common
properties:
- lf-infra-properties:
name: lf-sonar-github-common
properties:
- lf-infra-properties:
@@
-2379,7
+2392,7
@@
# Pipelines #
#############
# Pipelines #
#############
-- lf_pipelines_common: &lf_pipelines_common
+-
_
lf_pipelines_common: &lf_pipelines_common
name: lf-pipelines-common
######################
name: lf-pipelines-common
######################
@@
-2394,7
+2407,7
@@
submodule-timeout: 10
submodule-disable: false
submodule-timeout: 10
submodule-disable: false
-- lf_global_pipelines_common: &lf_global_pipelines_common
+-
_
lf_global_pipelines_common: &lf_global_pipelines_common
name: lf-global-pipelines-common
# All jobs are triggering from the same source
name: lf-global-pipelines-common
# All jobs are triggering from the same source