Skip to content
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

Jump to bottom

fix: switch ci fixes #5358

Merged
merged 11 commits into from
Jul 12, 2024
Merged

fix: switch ci fixes #5358

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
2a1efbc
fix: switch ci fixes
gireesh-naidu Jun 25, 2024
24edc3d
Merge branch 'main' into fixes/change-ci-oss
gireesh-naidu Jul 2, 2024
460fe9a
Merge branch 'main' into fixes/change-ci-oss
gireesh-naidu Jul 8, 2024
d043662
chore: review refactoring
gireesh-naidu Jul 8, 2024
a167b11
chore: refactoring
gireesh-naidu Jul 8, 2024
983c890
Merge branch 'main' into fixes/change-ci-oss
gireesh-naidu Jul 11, 2024
79b4b8e
fix: add missing validations in switching to external ci
gireesh-naidu Jul 11, 2024
fe709f6
fix: ci pipeline id is not being updated in cd pipeline if switching …
gireesh-naidu Jul 11, 2024
122c1ed
fix: update ci pipeline id in all the cd workflows that exists in the…
gireesh-naidu Jul 11, 2024
08da70e
fix: checkIfNsExistsForEnvIds , empty envIds check fix
gireesh-naidu Jul 11, 2024
5835c9e
Merge branch 'main' into fixes/change-ci-oss
gireesh-naidu Jul 12, 2024
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
Prev Previous commit
Next Next commit
chore: refactoring
  • Loading branch information
@gireesh-naidu
gireesh-naidu committed Jul 8, 2024
commit a167b11a367954c8b29c645b3631ff75419010b7
6 changes: 4 additions & 2 deletions pkg/pipeline/BuildPipelineSwitchService.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
package pipeline

import (
"fmt"
"github.com/devtron-labs/devtron/internal/sql/repository/appWorkflow"
"github.com/devtron-labs/devtron/internal/sql/repository/pipelineConfig"
"github.com/devtron-labs/devtron/internal/util"
"github.com/devtron-labs/devtron/pkg/bean"
"github.com/devtron-labs/devtron/pkg/pipeline/adapter"
pipelineConfigBean "github.com/devtron-labs/devtron/pkg/pipeline/bean/CiPipeline"
Expand All @@ -29,6 +29,7 @@ import (
"github.com/go-pg/pg"
"github.com/juju/errors"
"go.uber.org/zap"
"net/http"
"time"
)

Expand Down Expand Up @@ -139,7 +140,8 @@ func (impl *BuildPipelineSwitchServiceImpl) createNewPipelineAndReplaceOldPipeli

isSelfLinkedCiPipeline := switchFromType != pipelineConfigBean.EXTERNAL && ciPipelineReq.IsLinkedCi() && ciPipelineReq.ParentCiPipeline == switchFromPipelineId
if isSelfLinkedCiPipeline {
return nil, fmt.Errorf("cannot create linked ci pipeline from the same source")
errMsg := "cannot create linked ci pipeline from the same source"
return nil, util.NewApiError().WithInternalMessage(errMsg).WithUserMessage(errMsg).WithHttpStatusCode(http.StatusBadRequest)
}

tx, err := impl.ciPipelineRepository.StartTx()
Expand Down
Loading