Skip to content

refactor: enhance CI job environment resolution and add dynamic value constraint scripting support #6971

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

Open
vivekanandan-devtron wants to merge 2 commits into
base: main
Choose a base branch
from
+19 −9
Open

refactor: enhance CI job environment resolution and add dynamic value constraint scripting support #6971

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7d8aa22
refactor: enhance CI job environment resolution and add dynamic value…
vivekanandan-one2n Jun 23, 2026
aa9c1a1
refactor: enhance CI job environment resolution and add dynamic value…
vivekanandan-one2n Jun 24, 2026
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
28 changes: 19 additions & 9 deletions pkg/build/trigger/HandlerService.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,10 +89,10 @@ type HandlerService interface {

// CATEGORY=CI_BUILDX
type BuildxGlobalFlags struct {
BuildxCacheModeMin bool `env:"BUILDX_CACHE_MODE_MIN" envDefault:"false" description:"To set build cache mode to minimum in buildx" `
AsyncBuildxCacheExport bool `env:"ASYNC_BUILDX_CACHE_EXPORT" envDefault:"false" description:"To enable async container image cache export"`
BuildxInterruptionMaxRetry int `env:"BUILDX_INTERRUPTION_MAX_RETRY" envDefault:"3" description:"Maximum number of retries for buildx builder interruption"`
BuildxBuilderPodWaitDurationSecs int `env:"BUILDX_BUILDER_POD_WAIT_DURATION_SECS" envDefault:"120" description:"Timeout in seconds to wait for buildx k8s driver builder pods to be ready (initial startup and after spot interruption)"`
BuildxCacheModeMin bool `env:"BUILDX_CACHE_MODE_MIN" envDefault:"false" description:"To set build cache mode to minimum in buildx" `
AsyncBuildxCacheExport bool `env:"ASYNC_BUILDX_CACHE_EXPORT" envDefault:"false" description:"To enable async container image cache export"`
BuildxInterruptionMaxRetry int `env:"BUILDX_INTERRUPTION_MAX_RETRY" envDefault:"3" description:"Maximum number of retries for buildx builder interruption"`
BuildxBuilderPodWaitDurationSecs int `env:"BUILDX_BUILDER_POD_WAIT_DURATION_SECS" envDefault:"120" description:"Timeout in seconds to wait for buildx k8s driver builder pods to be ready (initial startup and after spot interruption)"`
}

type HandlerServiceImpl struct {
Expand Down Expand Up @@ -916,14 +916,24 @@ func (impl *HandlerServiceImpl) getEnvironmentForJob(pipeline *pipelineConfig.Ci
isJob := false
if app.AppType == helper.Job {
isJob = true
if trigger.EnvironmentId != 0 {
env, err = impl.envRepository.FindById(trigger.EnvironmentId)
if err != nil {
impl.Logger.Errorw("could not find environment", "err", err)
if trigger.EnvironmentId == 0 {
ciEnvMapping, err := impl.ciPipelineRepository.FindCiEnvMappingByCiPipelineId(trigger.EnvironmentId)
if err != nil && !util.IsErrNoRows(err) {
impl.Logger.Errorw("error in saving pipeline", "pipelineId", pipeline.Id, "err", err)
return nil, isJob, err
}
return env, isJob, nil
if ciEnvMapping != nil {
trigger.EnvironmentId = ciEnvMapping.EnvironmentId
}
}

env, err = impl.envRepository.FindById(trigger.EnvironmentId)
if err != nil {
impl.Logger.Errorw("could not find environment", "err", err)
return nil, isJob, err
}

return env, isJob, nil
}
return nil, isJob, nil
}
Expand Down
Loading