Skip to content

Remove references to konflux-tooling image and use released version #2354

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 13, 2025
Merged

Remove references to konflux-tooling image and use released version #2354

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions deploy/tasks/pre-build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,6 @@ spec:
- name: IMAGE_URL
description: URL of the OCI image to use.
type: string
- name: PNC_KONFLUX_TOOLING_IMAGE
description: Name of the tooling image.
type: string
- name: RECIPE_IMAGE
description: The image from the build recipe to use
results:
Expand All @@ -38,7 +35,7 @@ spec:
mountPath: /var/workdir
steps:
- name: preprocessor
image: $(params.PNC_KONFLUX_TOOLING_IMAGE)
image: quay.io/konflux-ci/pnc-konflux-tooling:latest
securityContext:
runAsUser: 0
computeResources:
Expand All @@ -53,7 +50,7 @@ spec:
- --build-tool-version=$(params.BUILD_TOOL_VERSION)
- --java-version=$(params.JAVA_VERSION)
- --recipe-image=$(params.RECIPE_IMAGE)
- --tooling-image=$(params.PNC_KONFLUX_TOOLING_IMAGE)
- --tooling-image=quay.io/konflux-ci/pnc-konflux-tooling:latest
- --type=$(params.BUILD_TOOL)
- $(workspaces.source.path)/source
env:
Expand Down
7 changes: 2 additions & 5 deletions deploy/tasks/push-results.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,6 @@ spec:
description: bifrost url to upload log
type: string
default: ""
- name: PNC_KONFLUX_TOOLING_IMAGE
description: Name of the tooling image.
type: string
- name: caTrustConfigMapKey
description: The name of the key in the ConfigMap that contains the
CA bundle data.
Expand Down Expand Up @@ -88,7 +85,7 @@ spec:
- name: IMAGE_URL
value: $(params.IMAGE_URL)
- name: upload-artifacts
image: $(params.PNC_KONFLUX_TOOLING_IMAGE)
image: quay.io/konflux-ci/pnc-konflux-tooling:latest
securityContext:
runAsUser: 0
computeResources:
Expand Down Expand Up @@ -122,7 +119,7 @@ spec:
fi
/opt/jboss/container/java/run/run-java.sh $@
- name: upload-log
image: $(params.PNC_KONFLUX_TOOLING_IMAGE)
image: quay.io/konflux-ci/pnc-konflux-tooling:latest
securityContext:
runAsUser: 0
computeResources:
Expand Down
4 changes: 2 additions & 2 deletions pkg/apis/jvmbuildservice/v1alpha1/systemconfig_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ type SystemConfigList struct {

const (
KonfluxGitDefinition = "https://raw.githubusercontent.com/konflux-ci/build-definitions/refs/heads/main/task/git-clone/0.1/git-clone.yaml"
KonfluxPreBuildDefinitions = "https://raw.githubusercontent.com/redhat-appstudio/jvm-build-service/main/deploy/tasks/pre-build.yaml"
KonfluxPreBuildDefinitions = "https://raw.githubusercontent.com/rnc/jvm-build-service/TOOLING/deploy/tasks/pre-build.yaml"
KonfluxPreBuildGitDefinitions = "https://raw.githubusercontent.com/redhat-appstudio/jvm-build-service/main/deploy/tasks/pre-build-git.yaml"
KonfluxBuildDefinitions = "https://raw.githubusercontent.com/redhat-appstudio/jvm-build-service/main/deploy/tasks/buildah-oci-ta.yaml"
KonfluxDeployDefinitions = "https://raw.githubusercontent.com/ruhan1/jvm-build-service/main-uploadlog/deploy/tasks/push-results.yaml"
KonfluxDeployDefinitions = "https://raw.githubusercontent.com/rnc/jvm-build-service/TOOLING/deploy/tasks/push-results.yaml"
)
17 changes: 1 addition & 16 deletions pkg/reconciler/dependencybuild/buildrecipeyaml.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,7 @@ const (
PostBuildTaskName = "post-build"
UploadTaskName = "upload-artifacts"

DomainProxyImage = "quay.io/redhat-user-workloads/konflux-jbs-pnc-tenant/domain-proxy:latest"
PNCKonfluxToolingImage = "quay.io/redhat-user-workloads/konflux-jbs-pnc-tenant/konflux-tooling:latest"
DomainProxyImage = "quay.io/redhat-user-workloads/konflux-jbs-pnc-tenant/domain-proxy:latest"
)

//go:embed scripts/maven-build.sh
Expand Down Expand Up @@ -428,13 +427,6 @@ func createPipelineSpec(log logr.Logger, tool string, commitTime int64, jbsConfi
// StringVal: strings.Join(recipe.DisabledPlugins, ","),
// },
//},
{
Name: "PNC_KONFLUX_TOOLING_IMAGE",
Value: tektonpipeline.ParamValue{
Type: tektonpipeline.ParamTypeString,
StringVal: PNCKonfluxToolingImage,
},
},
},
}}
pipelinePreBuildGitTask := []tektonpipeline.PipelineTask{{
Expand Down Expand Up @@ -781,13 +773,6 @@ use-archive oci:$URL@$AARCHIVE=%s`, orasOptions, registryArgsWithDefaults(jbsCon
StringVal: "jbs-server",
},
},
{
Name: "PNC_KONFLUX_TOOLING_IMAGE",
Value: tektonpipeline.ParamValue{
Type: tektonpipeline.ParamTypeString,
StringVal: PNCKonfluxToolingImage,
},
},
},
}}, ps.Tasks...)

Expand Down
Loading