Merge pull request #3 from opendevstack/hotfix/rollout-stage

Fix component stage rollout and agent image tag

.gitignore

@@ -1,3 +1,5 @@
 bin/
 converter
-out/
+internal/test/**/out/Jenkinsfile
+out/Jenkinsfile
+cover.out

Makefile

@@ -1,12 +1,16 @@
 export GO111MODULE=on
 
-all: build dist
+all: build test dist
 .PHONY: all
 
 build:
 	go build -o converter
 .PHONY: build
 
+test:
+	go test -v -coverprofile cover.out
+.PHONY: test
+
 dist:
 	mkdir -p bin
 	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags -a -installsuffix cgo -o bin/converter

README.md

@@ -53,7 +53,7 @@ You can run the binary for your platform. To preview the changes that will be do
 ## Run it with `Go`
 
 ```cli
-  go run . -filename="examples/machine-learning/Jenkinsfile" -out out/Jenkinsfile"
+  go run . -filename="examples/machine-learning/Jenkinsfile" -out "out/Jenkinsfile"
 ```
 
 ## Features

internal/test/stage-rollout-multi-line/Jenkinsfile

@@ -0,0 +1,62 @@
+// See https://www.opendevstack.org/ods-documentation/ for usage and customization.
+
+@Library('[email protected]') _
+
+node { 
+    dockerRegistry = env.DOCKER_REGISTRY
+}
+
+odsComponentPipeline(
+  imageStreamTag: 'ods/jenkins-agent-maven:3.0.0',
+  branchToEnvironmentMapping: [
+    'master': 'dev',
+    'release/': 'test',
+  ]
+) { context ->
+
+  odsComponentStageImportOpenShiftImageOrElse(context) {
+    stageBuild(context)
+    odsComponentStageScanWithSonar(context)
+    odsComponentStageBuildOpenShiftImage(context,[
+      tailorParams: [
+        "DOCKER_REGISTRY=${dockerRegistry}"
+      ]
+      ])
+  }
+  odsComponentStageRolloutOpenShiftDeployment(context, [
+    deployTimeoutMinutes: 5,
+    openshiftDir: "openshift",
+    dockerDir: "docker",
+    resourceName        : "${context.componentId}",
+    tailorSelector      : "app=${context.projectId}-${context.componentId}",    
+    tailorExclude       : 'bc,is',
+     tailorParams: [
+        "DOCKER_REGISTRY=${dockerRegistry}"
+      ]    
+    // tailorParams        : [
+    //   "PROJECT=${context.projectId}",  // projectId == atlasdev-dev, targetProject == atlasdev
+    //   "ENV=${context.environment}",
+    //   "DOCKER_REGISTRY=${dockerRegistry}",
+    //   "COMPONENT=${context.componentId}",
+    //   "TAGVERSION=${context.gitCommit}",
+    // ],
+  ])
+}
+
+def stageBuild(def context) {
+  def javaOpts = "-Xmx512m"
+  def gradleTestOpts = "-Xmx128m"
+  def springBootEnv = context.environment
+  if (springBootEnv.contains('-dev')) {
+    springBootEnv = 'dev'
+  }
+  stage('Build and Unit Test') {
+    withEnv(["TAGVERSION=${context.tagversion}", "NEXUS_HOST=${context.nexusHost}", "NEXUS_USERNAME=${context.nexusUsername}", "NEXUS_PASSWORD=${context.nexusPassword}", "JAVA_OPTS=${javaOpts}","GRADLE_TEST_OPTS=${gradleTestOpts}","ENVIRONMENT=${springBootEnv}"]) {
+      def chmodXGradelw = sh(script: "chmod +x gradlew", returnStatus: true)
+      def status = sh(script: "./gradlew clean build --stacktrace --no-daemon", returnStatus: true)
+      if (status != 0) {
+        error "Build failed!"
+      }
+    }
+  }
+}

internal/test/stage-rollout-multi-line/golden/Jenkinsfile

@@ -0,0 +1,45 @@
+// See https://www.opendevstack.org/ods-documentation/ for usage and customization.
+
+@Library('[email protected]') _
+
+node { 
+    dockerRegistry = env.DOCKER_REGISTRY
+}
+
+odsComponentPipeline(
+  imageStreamTag: 'ods/jenkins-agent-maven:4.0.0',
+  branchToEnvironmentMapping: [
+    'master': 'dev',
+    'release/': 'test',
+  ]
+) { context ->
+
+  odsComponentFindOpenShiftImageOrElse(context) {
+    stageBuild(context)
+    odsComponentStageScanWithSonar(context)
+    odsComponentStageBuildOpenShiftImage(context,[
+      tailorParams: [
+        "DOCKER_REGISTRY=${dockerRegistry}"
+      ]
+      ])
+  }
+  odsComponentStageRolloutOpenShiftDeployment(context)
+}
+
+def stageBuild(def context) {
+  def javaOpts = "-Xmx512m"
+  def gradleTestOpts = "-Xmx128m"
+  def springBootEnv = context.environment
+  if (springBootEnv.contains('-dev')) {
+    springBootEnv = 'dev'
+  }
+  stage('Build and Unit Test') {
+    withEnv(["TAGVERSION=${context.tagversion}", "NEXUS_HOST=${context.nexusHost}", "NEXUS_USERNAME=${context.nexusUsername}", "NEXUS_PASSWORD=${context.nexusPassword}", "JAVA_OPTS=${javaOpts}","GRADLE_TEST_OPTS=${gradleTestOpts}","ENVIRONMENT=${springBootEnv}"]) {
+      def chmodXGradelw = sh(script: "chmod +x gradlew", returnStatus: true)
+      def status = sh(script: "./gradlew clean build --stacktrace --no-daemon", returnStatus: true)
+      if (status != 0) {
+        error "Build failed!"
+      }
+    }
+  }
+}

internal/test/stage-rollout-single-line/Jenkinsfile

@@ -0,0 +1,22 @@
+// See https://www.opendevstack.org/ods-documentation/ for usage and customization.
+
+@Library('[email protected]') _
+
+odsComponentPipeline(
+  imageStreamTag: 'ods/jenkins-agent-base:3.0.0',
+  openshiftBuildTimeout: 30,  
+  branchToEnvironmentMapping: [
+    'master': 'dev',
+    // 'release/': 'test'
+  ]
+) { context ->
+
+  odsComponentStageImportOpenShiftImageOrElse(context) {
+    odsComponentStageBuildOpenShiftImage(context)
+  }
+
+  // rollout auth proxy - this registers the dc for later promotion
+  odsComponentStageRolloutOpenShiftDeployment(context, [resourceName: "${context.componentId}-auth-proxy"])
+
+  odsComponentStageRolloutOpenShiftDeployment(context)
+}

internal/test/stage-rollout-single-line/golden/Jenkinsfile

@@ -0,0 +1,22 @@
+// See https://www.opendevstack.org/ods-documentation/ for usage and customization.
+
+@Library('[email protected]') _
+
+odsComponentPipeline(
+  imageStreamTag: 'ods/jenkins-agent-base:4.0.0',
+  openshiftBuildTimeout: 30,  
+  branchToEnvironmentMapping: [
+    'master': 'dev',
+    // 'release/': 'test'
+  ]
+) { context ->
+
+  odsComponentFindOpenShiftImageOrElse(context) {
+    odsComponentStageBuildOpenShiftImage(context)
+  }
+
+  // rollout auth proxy - this registers the dc for later promotion
+  odsComponentStageRolloutOpenShiftDeployment(context)
+
+  odsComponentStageRolloutOpenShiftDeployment(context)
+}

replacer.go

@@ -39,15 +39,28 @@ func replaceLibrary(content string) string {
 }
 
 func replaceAgentImages(content string) string {
-	re := regexp.MustCompile(`'ods/jenkins-agent-(.*):.*'`)
-	return re.ReplaceAllString(content, "'ods/jenkins-agent-$1:4.x'")
+	re := regexp.MustCompile(`'ods\/jenkins-agent-(.*):(\d).(.*)'`)
+	return re.ReplaceAllString(content, "'ods/jenkins-agent-$1:4.$3'")
 }
 
 func replaceComponentStageImport(content string) string {
 	return strings.Replace(content, "odsComponentStageImportOpenShiftImageOrElse", "odsComponentFindOpenShiftImageOrElse", -1)
 }
 
 func replaceComponentStageRollout(content string) string {
+	content, match := replaceComponentStageRolloutMultiLine(content)
+	if !match {
+		content, _ = replaceComponentStageRolloutSingleLine(content)
+	}
+	return content
+}
+
+func replaceComponentStageRolloutMultiLine(content string) (string, bool) {
+	re := regexp.MustCompile(`(?ms)odsComponentStageRolloutOpenShiftDeployment\((context, \[\n?.*)]\)$`)
+	return re.ReplaceAllString(content, "odsComponentStageRolloutOpenShiftDeployment(context)"), re.Match([]byte(content))
+}
+
+func replaceComponentStageRolloutSingleLine(content string) (string, bool) {
 	re := regexp.MustCompile(`odsComponentStageRolloutOpenShiftDeployment(.*)`)
-	return re.ReplaceAllString(content, "odsComponentStageRolloutOpenShiftDeployment(context)")
+	return re.ReplaceAllString(content, "odsComponentStageRolloutOpenShiftDeployment(context)"), re.Match([]byte(content))
 }

replacer_test.go

@@ -0,0 +1,61 @@
+package main
+
+import (
+	"io/ioutil"
+	"testing"
+)
+
+func TestReplace(t *testing.T) {
+
+	type args struct {
+		inputFile     string
+		convertedFile string
+	}
+	tests := []struct {
+		name string
+		args args
+		want string
+	}{
+		{
+			name: "Stage Rollout Single Line",
+			args: args{
+				inputFile:     "internal/test/stage-rollout-single-line/Jenkinsfile",
+				convertedFile: "internal/test/stage-rollout-single-line/out/Jenkinsfile",
+			},
+			want: readFile("internal/test/stage-rollout-single-line/golden/Jenkinsfile"),
+		},
+		{
+			name: "Stage Rollout Multi Line",
+			args: args{
+				inputFile:     "internal/test/stage-rollout-multi-line/Jenkinsfile",
+				convertedFile: "internal/test/stage-rollout-multi-line/out/Jenkinsfile",
+			},
+			want: readFile("internal/test/stage-rollout-multi-line/golden/Jenkinsfile"),
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+
+			Replace(tt.args.inputFile, tt.args.convertedFile, false)
+
+			converted, err := ioutil.ReadFile(tt.args.convertedFile)
+			if err != nil {
+				t.Errorf("failed to open file: %w", err)
+			}
+
+			if got := string(converted); got != string(tt.want) {
+				t.Errorf("Replace() =\n%v, want\n%v", got, string(tt.want))
+			}
+		})
+	}
+
+}
+
+func readFile(goldenFile string) string {
+	want, err := ioutil.ReadFile(goldenFile)
+	if err != nil {
+		panic(err)
+	}
+
+	return string(want)
+}