MT#59020 jbi: not all jobs define param_ppa with '$ppa' as default

Change-Id: I7b49bfc6eb66bbc441d362de609119c844a2a1cb
mprokop/trixie
Victor Seva 2 years ago
parent 8780a22359
commit 2e01ca44a3

@ -249,6 +249,10 @@ class JenkinsBuildInfo(models.Model):
self.tag, self.tag,
) )
@property
def has_ppa(self):
return self.param_ppa not in ["$ppa", None]
@property @property
def build_path(self): def build_path(self):
return settings.JBI_BASEDIR.joinpath( return settings.JBI_BASEDIR.joinpath(

@ -39,7 +39,7 @@ def jbi_manage(sender, **kwargs):
def gerrit_repo_add(instance): def gerrit_repo_add(instance):
if instance.param_ppa == "$ppa": if not instance.has_ppa:
logger.warn("ppa unset, skip removal") logger.warn("ppa unset, skip removal")
return return
GerritRepoInfo = apps.get_model("repoapi", "GerritRepoInfo") GerritRepoInfo = apps.get_model("repoapi", "GerritRepoInfo")
@ -68,7 +68,7 @@ def gerrit_repo_add(instance):
def gerrit_repo_del(instance): def gerrit_repo_del(instance):
if instance.param_ppa == "$ppa": if not instance.has_ppa:
logger.warn("ppa unset, skip removal") logger.warn("ppa unset, skip removal")
return return
GerritRepoInfo = apps.get_model("repoapi", "GerritRepoInfo") GerritRepoInfo = apps.get_model("repoapi", "GerritRepoInfo")
@ -93,7 +93,7 @@ def gerrit_repo_manage(sender, **kwargs):
branch=instance.param_branch, branch=instance.param_branch,
ppa=instance.param_ppa, ppa=instance.param_ppa,
) )
if instance.param_ppa == "$ppa": if not instance.has_ppa:
logger.warn("ppa unset, skip") logger.warn("ppa unset, skip")
return return
if ( if (

@ -98,6 +98,16 @@ class JenkinsBuildInfoTestCase(BaseTest):
job.job_url = JBI_HOST % "jenkins.local" job.job_url = JBI_HOST % "jenkins.local"
self.assertTrue(job.is_job_url_allowed()) self.assertTrue(job.is_job_url_allowed())
def test_creation_no_ppa(self):
jbi = JenkinsBuildInfo.objects.create(
projectname="fake",
jobname="fake-get-code",
buildnumber=1,
result="OK",
)
self.assertIsNone(jbi.param_ppa)
self.assertFalse(jbi.has_ppa)
class JenkinsBuildInfoProperties(BaseTest): class JenkinsBuildInfoProperties(BaseTest):
fixtures = ["test_model_queries"] fixtures = ["test_model_queries"]

Loading…
Cancel
Save