Skip to content

Commit 3e1dc84

Browse files
committed
Rename task and add defaults
1 parent fc554dc commit 3e1dc84

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

deploy/tasks/push-results.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,11 @@ spec:
4141
default: ""
4242
- name: BUILD_ID
4343
type: string
44+
default: ""
4445
- name: BIFROST_URL
4546
description: bifrost url to upload log
4647
type: string
48+
default: ""
4749
- name: PNC_KONFLUX_TOOLING_IMAGE
4850
description: Name of the tooling image.
4951
type: string

pkg/reconciler/dependencybuild/buildrecipeyaml.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ const (
3131
PreBuildGitTaskName = "pre-build-git"
3232
BuildTaskName = "build"
3333
PostBuildTaskName = "post-build"
34-
DeployTaskName = "deploy"
34+
UploadTaskName = "upload-artifacts"
3535

3636
DomainProxyImage = "quay.io/redhat-user-workloads/konflux-jbs-pnc-tenant/domain-proxy:latest"
3737
PNCKonfluxToolingImage = "quay.io/redhat-user-workloads/konflux-jbs-pnc-tenant/konflux-tooling:latest"
@@ -83,7 +83,7 @@ func createDeployPipelineSpec(jbsConfig *v1alpha1.JBSConfig, buildRequestProcess
8383
Params: []tektonpipeline.ParamSpec{{Name: PipelineResultImageDigest, Type: tektonpipeline.ParamTypeString}},
8484
Tasks: []tektonpipeline.PipelineTask{
8585
{
86-
Name: DeployTaskName,
86+
Name: UploadTaskName,
8787
TaskRef: &tektonpipeline.TaskRef{
8888
// Can't specify name and resolver as they clash.
8989
ResolverRef: resolver,
@@ -730,7 +730,7 @@ use-archive oci:$URL@$AARCHIVE=%s`, orasOptions, registryArgsWithDefaults(jbsCon
730730
}
731731
ps.Tasks = append([]tektonpipeline.PipelineTask{
732732
{
733-
Name: DeployTaskName,
733+
Name: UploadTaskName,
734734
RunAfter: append(runAfterBuild, PostBuildTaskName),
735735
// Don't need to specify WorkspacePipelineTaskBinding as the deploy task is using
736736
// an independent volume.

pkg/reconciler/dependencybuild/dependencybuild.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -626,7 +626,7 @@ func (r *ReconcileDependencyBuild) handleStateBuilding(ctx context.Context, db *
626626

627627
trueBool := true
628628
pr.Spec.TaskRunSpecs = []tektonpipeline.PipelineTaskRunSpec{{
629-
PipelineTaskName: DeployTaskName,
629+
PipelineTaskName: UploadTaskName,
630630
PodTemplate: &pod.Template{
631631
Env: []v1.EnvVar{
632632
{
@@ -1452,11 +1452,11 @@ func (r *ReconcileDependencyBuild) handleStateDeploying(ctx context.Context, db
14521452
}
14531453
}
14541454
if jbsConfig.Annotations != nil && jbsConfig.Annotations[jbsconfig.CITests] == "true" {
1455-
log.Info(fmt.Sprintf("Configuring resources for %#v", DeployTaskName))
1455+
log.Info(fmt.Sprintf("Configuring resources for %#v", UploadTaskName))
14561456
podMem, _ := resource.ParseQuantity("1024Mi")
14571457
podCPU, _ := resource.ParseQuantity("250m")
14581458
pr.Spec.TaskRunSpecs = []tektonpipeline.PipelineTaskRunSpec{{
1459-
PipelineTaskName: DeployTaskName,
1459+
PipelineTaskName: UploadTaskName,
14601460
ComputeResources: &v1.ResourceRequirements{
14611461
Requests: v1.ResourceList{"memory": podMem, "cpu": podCPU},
14621462
Limits: v1.ResourceList{"memory": podMem, "cpu": podCPU},

0 commit comments

Comments
 (0)