mirror of
https://github.com/rocky-linux/peridot.git
synced 2024-06-14 00:10:15 +00:00
allow peridot project to specify a build pool type in additional to build pool architecture
Signed-off-by: mystic knight <techguru@byiq.com>
This commit is contained in:
parent
69669dfb44
commit
816125a4c8
|
@ -215,8 +215,9 @@ func (a *Access) CreateProject(project *peridotpb.Project) (*models.Project, err
|
||||||
insert into projects
|
insert into projects
|
||||||
(name, major_version, dist_tag_override, target_gitlab_host, target_prefix,
|
(name, major_version, dist_tag_override, target_gitlab_host, target_prefix,
|
||||||
target_branch_prefix, source_git_host, source_prefix, source_branch_prefix, cdn_url,
|
target_branch_prefix, source_git_host, source_prefix, source_branch_prefix, cdn_url,
|
||||||
stream_mode, target_vendor, additional_vendor, archs, follow_import_dist, branch_suffix, git_make_public, vendor_macro, packager_macro)
|
stream_mode, target_vendor, additional_vendor, archs, build_pool_type,
|
||||||
values ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18, $19)
|
follow_import_dist, branch_suffix, git_make_public, vendor_macro, packager_macro)
|
||||||
|
values ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18, $19, $20)
|
||||||
returning id, created_at, updated_at
|
returning id, created_at, updated_at
|
||||||
`,
|
`,
|
||||||
ret.Name,
|
ret.Name,
|
||||||
|
@ -233,6 +234,7 @@ func (a *Access) CreateProject(project *peridotpb.Project) (*models.Project, err
|
||||||
ret.TargetVendor,
|
ret.TargetVendor,
|
||||||
ret.AdditionalVendor,
|
ret.AdditionalVendor,
|
||||||
ret.Archs,
|
ret.Archs,
|
||||||
|
ret.BuildPoolType,
|
||||||
ret.FollowImportDist,
|
ret.FollowImportDist,
|
||||||
ret.BranchSuffix,
|
ret.BranchSuffix,
|
||||||
ret.GitMakePublic,
|
ret.GitMakePublic,
|
||||||
|
@ -266,6 +268,7 @@ func (a *Access) UpdateProject(id string, project *peridotpb.Project) (*models.P
|
||||||
TargetVendor: project.TargetVendor,
|
TargetVendor: project.TargetVendor,
|
||||||
AdditionalVendor: project.AdditionalVendor.Value,
|
AdditionalVendor: project.AdditionalVendor.Value,
|
||||||
Archs: project.Archs,
|
Archs: project.Archs,
|
||||||
|
BuildPoolType: project.BuildPoolType,
|
||||||
FollowImportDist: project.FollowImportDist,
|
FollowImportDist: project.FollowImportDist,
|
||||||
BranchSuffix: utils.StringValueToNullString(project.BranchSuffix),
|
BranchSuffix: utils.StringValueToNullString(project.BranchSuffix),
|
||||||
GitMakePublic: project.GitMakePublic,
|
GitMakePublic: project.GitMakePublic,
|
||||||
|
@ -291,13 +294,14 @@ func (a *Access) UpdateProject(id string, project *peridotpb.Project) (*models.P
|
||||||
target_vendor = $12,
|
target_vendor = $12,
|
||||||
additional_vendor = $13,
|
additional_vendor = $13,
|
||||||
archs = $14,
|
archs = $14,
|
||||||
follow_import_dist = $15,
|
build_pool_type = $15,
|
||||||
branch_suffix = $16,
|
follow_import_dist = $16,
|
||||||
git_make_public = $17,
|
branch_suffix = $17,
|
||||||
vendor_macro = $18,
|
git_make_public = $18,
|
||||||
packager_macro = $19,
|
vendor_macro = $19,
|
||||||
|
packager_macro = $20,
|
||||||
updated_at = now()
|
updated_at = now()
|
||||||
where id = $20
|
where id = $21
|
||||||
returning id, created_at, updated_at
|
returning id, created_at, updated_at
|
||||||
`,
|
`,
|
||||||
ret.Name,
|
ret.Name,
|
||||||
|
@ -314,6 +318,7 @@ func (a *Access) UpdateProject(id string, project *peridotpb.Project) (*models.P
|
||||||
ret.TargetVendor,
|
ret.TargetVendor,
|
||||||
ret.AdditionalVendor,
|
ret.AdditionalVendor,
|
||||||
ret.Archs,
|
ret.Archs,
|
||||||
|
ret.BuildPoolType,
|
||||||
ret.FollowImportDist,
|
ret.FollowImportDist,
|
||||||
ret.BranchSuffix,
|
ret.BranchSuffix,
|
||||||
ret.GitMakePublic,
|
ret.GitMakePublic,
|
||||||
|
|
|
@ -174,6 +174,9 @@ message Project {
|
||||||
|
|
||||||
// Packager macro is what gets inserted as the packager in the RPM
|
// Packager macro is what gets inserted as the packager in the RPM
|
||||||
google.protobuf.StringValue packager_macro = 22;
|
google.protobuf.StringValue packager_macro = 22;
|
||||||
|
|
||||||
|
// specify a build pool type in additional to build pool architecture
|
||||||
|
google.protobuf.StringValue build_pool_type = 23;
|
||||||
}
|
}
|
||||||
|
|
||||||
// A repository is a yum repository that yumrepofs maintains
|
// A repository is a yum repository that yumrepofs maintains
|
||||||
|
|
Loading…
Reference in New Issue
Block a user