Merge branch 'develop' into config-diff-3-oss

Author: prakash100198

internal/sql/repository/pipelineConfig/CdWorfkflowRepository.go

@@ -693,9 +693,10 @@ func (impl *CdWorkflowRepositoryImpl) GetLatestTriggersOfHelmPipelinesStuckInNon
 		Where("cd_workflow_runner.cd_workflow_id in"+
 			" (SELECT max(cd_workflow.id) as id from cd_workflow"+
 			" INNER JOIN cd_workflow_runner on cd_workflow.id = cd_workflow_runner.cd_workflow_id"+
-			" WHERE cd_workflow_runner.status != ?"+
+			" WHERE cd_workflow_runner.workflow_type = ? "+
+			" AND cd_workflow_runner.status != ?"+
 			" GROUP BY cd_workflow.pipeline_id"+
-			" ORDER BY cd_workflow.pipeline_id desc)", cdWorkflow.WorkflowInQueue).
+			" ORDER BY cd_workflow.pipeline_id desc)", apiBean.CD_WORKFLOW_TYPE_DEPLOY, cdWorkflow.WorkflowInQueue).
 		Where("(cd_workflow__pipeline.deployment_app_type=? or dc.deployment_app_type=?)", util.PIPELINE_DEPLOYMENT_TYPE_HELM, util.PIPELINE_DEPLOYMENT_TYPE_HELM).
 		Where("cd_workflow_runner.started_on > NOW() - INTERVAL '? hours'", getPipelineDeployedWithinHours).
 		Where("cd_workflow__pipeline.deleted=?", false).

scripts/casbin/10_terminal.down.sql

@@ -0,0 +1 @@
+DELETE FROM casbin_rule where v0='role:super-admin___' and v1='terminal';

scripts/casbin/10_terminal.up.sql

@@ -0,0 +1,2 @@
+INSERT INTO "public"."casbin_rule" ("p_type", "v0", "v1", "v2", "v3", "v4", "v5") VALUES
+('p','role:super-admin___','terminal','*','*','allow','');