diff --git a/gc-policy.yaml b/gc-policy.yaml index efff42b0..6fb9242d 100644 --- a/gc-policy.yaml +++ b/gc-policy.yaml @@ -1,6 +1,8 @@ branched: + containers: 2w cloud-uploads: 1y rawhide: + containers: 2w cloud-uploads: 1y bodhi-updates: cloud-uploads: 1y diff --git a/jobs/garbage-collection.Jenkinsfile b/jobs/garbage-collection.Jenkinsfile index b51b2d0f..ebb10169 100644 --- a/jobs/garbage-collection.Jenkinsfile +++ b/jobs/garbage-collection.Jenkinsfile @@ -56,7 +56,7 @@ lock(resource: "gc-${params.STREAM}") { // containers tags and cloud artifacts can be GCed in parallel def parallelruns = [:] - parallelruns['Cloud artifacts'] { + parallelruns['Cloud artifacts'] = { withCredentials([file(variable: 'GCP_KOLA_TESTS_CONFIG', credentialsId: 'gcp-image-upload-config')]) { stage('Cloud artifacts GC') { pipeutils.shwrapWithAWSBuildUploadCredentials(""" @@ -90,14 +90,13 @@ lock(resource: "gc-${params.STREAM}") { } } } - parallelruns['Container tags'] { + parallelruns['Container tags'] = { // get repo url from pipecfg def registry = pipecfg.registry_repos.oscontainer.repo - pipecfg, params.STREAM, params.VERSION) withCredentials([file(variable: 'REGISTRY_SECRET', credentialsId: 'oscontainer-push-registry-secret')]) { pipeutils.shwrap(""" - cosa container-prune --policy ${new_gc_policy_path} \ + cosa container-prune --policy ${new_gc_policy_path} \ --registry-auth-file=\${REGISTRY_SECRET} \ --stream ${params.STREAM} ${dry_run} \ ${registry}