From ef57a0c53b17f55c34b87a66270bc0dfe36c4706 Mon Sep 17 00:00:00 2001 From: Fabien Boucher Date: Jan 26 2021 17:19:03 +0000 Subject: Ensure arch specfic jobs does not produce a repo artifact --- diff --git a/zuul.d/jobs.dhall b/zuul.d/jobs.dhall index 75e4e2c..e354c8e 100644 --- a/zuul.d/jobs.dhall +++ b/zuul.d/jobs.dhall @@ -120,7 +120,6 @@ let common_koji_rpm_build = , nodeset = Some default_nodeset , roles = Some [ { zuul = "zuul-distro-jobs" } ] , run = Some "playbooks/koji/build-ng.yaml" - , provides = Some [ "${job-prefix}repo" ] , secrets = Some [ Zuul.Job.Secret::{ name = "krb_keytab", secret = "krb_keytab" } ] } @@ -165,6 +164,10 @@ let generateRpmBuildJob = , name = generateRpmBuildJobName arch kbtype , parent = Some (Zuul.Job.getName common_koji_rpm_build) , final = Some True + , provides = + if Arch.isX86_64 arch && KojiBuild.isScratch kbtype + then Some [ "${job-prefix}repo" ] + else None (List Text) , dependencies = if Arch.isX86_64 arch then None (List Zuul.Job.Dependency.Union) diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index c0e4c1e..46c1cb5 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -36,8 +36,6 @@ abstract: true nodeset: fedora-33-container protected: true - provides: - - repo roles: - zuul: zuul-distro-jobs secrets: @@ -51,6 +49,8 @@ branches: - master final: true + provides: + - repo vars: arches: x86_64 fetch_artifacts: true @@ -139,6 +139,8 @@ branches: - f33 final: true + provides: + - repo vars: arches: x86_64 fetch_artifacts: true @@ -227,6 +229,8 @@ branches: - f32 final: true + provides: + - repo vars: arches: x86_64 fetch_artifacts: true @@ -315,6 +319,8 @@ branches: - epel8 final: true + provides: + - repo vars: arches: x86_64 fetch_artifacts: true