fix: [CI-14984]: fixed mergeRunStep issue #240

Anshika2203 · 2024-11-06T10:51:16Z

Removed the pushed flag:
The pushed flag was unnecessary and potentially confusing
The logic now handles all cases without needing to track whether something was pushed

Simplified the loop logic:
Removed the conditional check if i != len(*steps)-1
Made the merge/no-merge decision more straightforward

Fixed the last step handling:
Always append the final cursor state after the loop
This ensures we don't lose any steps regardless of whether the last step was merged or not (which was the main issue).

Also added a function which checks that if image is non-default then it will not merge.

Jenkins pipeline which I mentioned in the ticket in now returning correct output.

pipeline:
  identifier: default
  name: default
  orgIdentifier: default
  projectIdentifier: default
  properties:
    ci:
      codebase:
        build: <+input>
  stages:
  - stage:
      identifier: build
      name: build
      spec:
        cloneCodebase: true
        execution:
          steps:
          - stepGroup:
              identifier: Stage__null645b44
              name: Checkout
              timeout: ""
          - stepGroup:
              identifier: Stage__null959e75
              name: Plugin Build
              steps:
              - step:
                  identifier: stagenull30d2ac
                  name: maven
                  spec:
                    command: mvn clean install                        package
                    envVariables:
                      ANT_HOME: /var/jenkins_home/tools/hudson.tasks.Ant_AntInstallation/ant1
                      M2_HOME: /var/jenkins_home/tools/hudson.tasks.Maven_MavenInstallation/maven1
                      MAVEN_HOME: /var/jenkins_home/tools/hudson.tasks.Maven_MavenInstallation/maven1
                      PATH+ANT: /var/jenkins_home/tools/hudson.tasks.Ant_AntInstallation/ant1/bin
                      PATH+GRADLE: /var/jenkins_home/tools/hudson.plugins.gradle.GradleInstallation/gradle1/bin
                      PATH+MAVEN: /var/jenkins_home/tools/hudson.tasks.Maven_MavenInstallation/maven1/bin
                    image: maven:latest
                    shell: Sh
                  timeout: ""
                  type: Run
              - step:
                  identifier: stagenull51182d
                  name: ant
                  spec:
                    command: ant build
                    envVariables:
                      ANT_HOME: /var/jenkins_home/tools/hudson.tasks.Ant_AntInstallation/ant1
                      M2_HOME: /var/jenkins_home/tools/hudson.tasks.Maven_MavenInstallation/maven1
                      MAVEN_HOME: /var/jenkins_home/tools/hudson.tasks.Maven_MavenInstallation/maven1
                      PATH+ANT: /var/jenkins_home/tools/hudson.tasks.Ant_AntInstallation/ant1/bin
                      PATH+GRADLE: /var/jenkins_home/tools/hudson.plugins.gradle.GradleInstallation/gradle1/bin
                      PATH+MAVEN: /var/jenkins_home/tools/hudson.tasks.Maven_MavenInstallation/maven1/bin
                    image: frekele/ant:latest
                    shell: Sh
                  timeout: ""
                  type: Run
              - step:
                  identifier: stagenulld802a5
                  name: gradle
                  spec:
                    command: gradle build
                    envVariables:
                      ANT_HOME: /var/jenkins_home/tools/hudson.tasks.Ant_AntInstallation/ant1
                      M2_HOME: /var/jenkins_home/tools/hudson.tasks.Maven_MavenInstallation/maven1
                      MAVEN_HOME: /var/jenkins_home/tools/hudson.tasks.Maven_MavenInstallation/maven1
                      PATH+ANT: /var/jenkins_home/tools/hudson.tasks.Ant_AntInstallation/ant1/bin
                      PATH+GRADLE: /var/jenkins_home/tools/hudson.plugins.gradle.GradleInstallation/gradle1/bin
                      PATH+MAVEN: /var/jenkins_home/tools/hudson.tasks.Maven_MavenInstallation/maven1/bin
                    image: gradle:latest
                    shell: Sh
                  timeout: ""
                  type: Run
              timeout: ""
          - stepGroup:
              identifier: Stage__null847254
              name: Code Analysis
              steps:
              - step:
                  identifier: stagenull7d2a33
                  name: sonarCube
                  spec:
                    envVariables:
                      ANT_HOME: /var/jenkins_home/tools/hudson.tasks.Ant_AntInstallation/ant1
                      M2_HOME: /var/jenkins_home/tools/hudson.tasks.Maven_MavenInstallation/maven1
                      MAVEN_HOME: /var/jenkins_home/tools/hudson.tasks.Maven_MavenInstallation/maven1
                      PATH+ANT: /var/jenkins_home/tools/hudson.tasks.Ant_AntInstallation/ant1/bin
                      PATH+GRADLE: /var/jenkins_home/tools/hudson.plugins.gradle.GradleInstallation/gradle1/bin
                      PATH+MAVEN: /var/jenkins_home/tools/hudson.tasks.Maven_MavenInstallation/maven1/bin
                      scannerHome: /var/jenkins_home/tools/hudson.plugins.sonar.SonarRunnerInstallation/sonar1
                    image: aosapps/drone-sonar-plugin
                    settings:
                      sonar_host: <+input>
                      sonar_token: <+input>
                  timeout: ""
                  type: Plugin
              timeout: ""
        platform:
          arch: Amd64
          os: Linux
        runtime:
          spec: {}
          type: Cloud
      type: CI

hemanthmantri · 2024-11-07T00:17:04Z

Please add UTs and include a link to pipeline which shows the steps after conversion.

Anshika2203 · 2024-11-07T07:57:52Z

Please add UTs and include a link to pipeline which shows the steps after conversion.

Added UTs and passed alpine as a defaultImage variable.

sean-harness · 2024-11-15T09:33:42Z

convert/jenkinsjson/convert.go

@@ -62,13 +62,16 @@ type ProcessedTools struct {
 var mavenGoals string
 var gradleGoals string

+var defaultAlpineImage string


If this image is being passed from the CLI then naming this variable using a particular image will be confusing. As per other places the more generic defaultImage makes more sense.

i agree with that. @Anshika2203 please change naming

sean-harness · 2024-11-15T09:52:08Z

convert/jenkinsjson/convert.go

@@ -963,6 +965,10 @@ func canMergeSteps(step1, step2 *harness.Step) bool {
 		return false
 	}

+	if !hasDefaultOrNoImage(exec1) || !hasDefaultOrNoImage(exec2) {


In the case where both step1 and step2 have no image, I assume they could be merged since the image matches?

fix: [CI-14984]: fix mergeRunStep issue

811855e

Anshika2203 requested review from Ompragash and jamie-harness November 6, 2024 10:51

fix: [CI-14984]: Made alpine image a variable and added UTs.

abab201

hemanthmantri requested a review from sean-harness November 15, 2024 08:38

sean-harness reviewed Nov 15, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: [CI-14984]: fixed mergeRunStep issue #240

fix: [CI-14984]: fixed mergeRunStep issue #240

Anshika2203 commented Nov 6, 2024 •

edited

Loading

hemanthmantri commented Nov 7, 2024

Anshika2203 commented Nov 7, 2024

sean-harness Nov 15, 2024

jamie-harness Nov 15, 2024 •

edited

Loading

sean-harness Nov 15, 2024

fix: [CI-14984]: fixed mergeRunStep issue #240

Are you sure you want to change the base?

fix: [CI-14984]: fixed mergeRunStep issue #240

Conversation

Anshika2203 commented Nov 6, 2024 • edited Loading

hemanthmantri commented Nov 7, 2024

Anshika2203 commented Nov 7, 2024

sean-harness Nov 15, 2024

Choose a reason for hiding this comment

jamie-harness Nov 15, 2024 • edited Loading

Choose a reason for hiding this comment

sean-harness Nov 15, 2024

Choose a reason for hiding this comment

Anshika2203 commented Nov 6, 2024 •

edited

Loading

jamie-harness Nov 15, 2024 •

edited

Loading