From fbcfde5ab82657fd756bce3cd0bec7e02f455702 Mon Sep 17 00:00:00 2001 From: Kevin W Monroe Date: Mon, 21 Aug 2023 15:54:29 -0500 Subject: [PATCH] make sync-upstream jobs consistent (#1408) --- jobs/sync-upstream.yaml | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/jobs/sync-upstream.yaml b/jobs/sync-upstream.yaml index 8ba80b165..5fa0d546d 100644 --- a/jobs/sync-upstream.yaml +++ b/jobs/sync-upstream.yaml @@ -188,11 +188,12 @@ - k8s-jenkins-jenkaas properties: - build-discarder: - days-to-keep: 2 + num-to-keep: 10 wrappers: - default-job-wrapper - ci-creds parameters: + - global-params - string: name: K8S_VERSION description: Stable K8S version to tag branches against. @@ -216,7 +217,8 @@ --charm-list jobs/includes/charm-support-matrix.inc \ --bundle-revision $BUNDLE_REV \ --k8s-version $K8S_VERSION \ - --filter-by-tag $FILTER_BY_TAG + --filter-by-tag $FILTER_BY_TAG \ + $IS_DRY_RUN - job: name: 'sync-stable-tag-bugfix-rev' @@ -228,11 +230,12 @@ - k8s-jenkins-jenkaas properties: - build-discarder: - days-to-keep: 1 + num-to-keep: 10 wrappers: - default-job-wrapper - ci-creds parameters: + - global-params - string: name: K8S_VERSION description: Stable K8S version to tag branches against. @@ -257,7 +260,8 @@ --bundle-revision $BUGFIX_REV \ --k8s-version $K8S_VERSION \ --filter-by-tag $FILTER_BY_TAG \ - --bugfix + --bugfix \ + $IS_DRY_RUN - job: name: 'cut-stable-release' @@ -291,7 +295,8 @@ --layer-list jobs/includes/charm-layer-list.inc \ --charm-list jobs/includes/charm-support-matrix.inc \ --ancillary-list jobs/includes/ancillary-list.inc \ - --filter-by-tag $FILTER_BY_TAG $IS_DRY_RUN + --filter-by-tag $FILTER_BY_TAG \ + $IS_DRY_RUN - job: name: 'rename-branch' @@ -303,7 +308,7 @@ - k8s-jenkins-jenkaas properties: - build-discarder: - days-to-keep: 2 + num-to-keep: 10 parameters: - global-params - string: