diff --git a/bundle/bundle.yaml b/bundle/bundle.yaml index cb52043..3dea0ef 100644 --- a/bundle/bundle.yaml +++ b/bundle/bundle.yaml @@ -1,5 +1,5 @@ apiVersion: "1" -version: "1" +version: "2" id: "cloudbees-aswin-ops-controller" description: "CloudBees CI configuration bundle for the cloudbees-aswin ops-controller Controller" availabilityPattern: "cloudbees-ci-casc-workshop/cloudbees-aswin/ops-controller" @@ -9,3 +9,5 @@ plugins: - "plugins.yaml" items: - "items.yaml" +catalog: + - "plugin-catalog.yaml" diff --git a/bundle/items.yaml b/bundle/items.yaml index 08f8c56..1bb2458 100644 --- a/bundle/items.yaml +++ b/bundle/items.yaml @@ -3,7 +3,15 @@ removeStrategy: items: NONE items: - kind: folder + displayName: controller-jobs name: controller-jobs + properties: + - itemRestrictions: + allowedTypes: + - org.jenkinsci.plugins.workflow.job.WorkflowJob + - jenkins.branch.OrganizationFolder + - org.jenkinsci.plugins.workflow.multibranch.WorkflowMultiBranchProject + filter: true items: - kind: organizationFolder name: controller-casc-update diff --git a/bundle/jenkins.yaml b/bundle/jenkins.yaml index 0406755..2b62a43 100644 --- a/bundle/jenkins.yaml +++ b/bundle/jenkins.yaml @@ -11,7 +11,7 @@ jenkins: - key: "BUNDLE_ID" value: "${CASC_BUNDLE_ID}" quietPeriod: 0 - systemMessage: 'Jenkins configured using CloudBees CI CasC v1' + systemMessage: 'Jenkins configured using CloudBees CI CasC v2' notificationConfiguration: enabled: true router: "operationsCenter" @@ -41,7 +41,7 @@ unclassified: repoOwner: "${GITHUB_ORGANIZATION}" repository: "pipeline-library" headerLabel: - text: "${GITHUB_APP}-bundle-v1" + text: "${GITHUB_APP}-bundle-v2" credentials: system: domainCredentials: diff --git a/bundle/plugin-catalog.yaml b/bundle/plugin-catalog.yaml new file mode 100644 index 0000000..f1ecc9f --- /dev/null +++ b/bundle/plugin-catalog.yaml @@ -0,0 +1,9 @@ +type: plugin-catalog +version: '1' +name: ops-controller +displayName: Autogenerated catalog from ops-controller +configurations: +- description: Exported plugins + includePlugins: + pipeline-utility-steps: + version: 2.13.0 diff --git a/bundle/plugins.yaml b/bundle/plugins.yaml index adac882..5d65aac 100644 --- a/bundle/plugins.yaml +++ b/bundle/plugins.yaml @@ -28,3 +28,4 @@ plugins: - id: workflow-aggregator - id: workflow-cps-checkpoint # non-cap plugins +- id: pipeline-utility-steps