SRVKP-7520 Update jib-maven test to push to quay.io

Author: jayesh-garg

pkg/oc/oc.go

@@ -164,6 +164,15 @@ func CreateChainsImageRegistrySecret(dockerConfig string) {
 	cmd.MustSucceed("oc", "create", "secret", "generic", "chains-image-registry-credentials", "--from-literal=.dockerconfigjson="+dockerConfig, "--from-literal=config.json="+dockerConfig, "--type=kubernetes.io/dockerconfigjson")
 }
 
+func CreateJibMavenImageRegistrySecret(dockerConfig string) {
+	cmd.MustSucceed("oc", "create", "secret", "generic", "jib-maven-image-registry-credentials", "--from-literal=.dockerconfigjson="+dockerConfig, "--from-literal=config.json="+dockerConfig, "--type=kubernetes.io/dockerconfigjson")
+}
+
+func GetDockerConfigJson(secretName, namespace string) string {
+	return cmd.MustSucceed("oc", "get", "secret", secretName, "-n", namespace, "-o", "jsonpath={.data['.dockerconfigjson']}").Stdout()
+}
+
+
 func CopySecret(secretName string, sourceNamespace string, destNamespace string) {
 	secretJson := cmd.MustSucceed("oc", "get", "secret", secretName, "-n", sourceNamespace, "-o", "json").Stdout()
 	cmdOutput := cmd.MustSucceed("bash", "-c", fmt.Sprintf(`echo '%s' | jq 'del(.metadata["namespace", "creationTimestamp", "resourceVersion", "selfLink", "uid", "annotations"]) | .data |= with_entries(if .key == "github-auth-key" then .key = "token" else . end)'`, secretJson)).Stdout()

specs/ecosystem/ecosystem-multiarch.spec

@@ -12,6 +12,8 @@ Type: Functional
 Importance: Critical
 
 Steps:
+  * Verify that jib-maven image registry variable is exported
+  * Create secret with image registry credentials for jib-maven
   * Create
       |S.NO|resource_dir                                          |
       |----|------------------------------------------------------|
@@ -31,6 +33,8 @@ Type: Functional
 Importance: Critical
 
 Steps:
+  * Verify that jib-maven image registry variable is exported
+  * Create secret with image registry credentials for jib-maven
   * Create
       |S.NO|resource_dir                                          |
       |----|------------------------------------------------------|

steps/ecosystem/ecosystem.go

@@ -0,0 +1,25 @@
+package ecosystem
+
+import (
+	"encoding/base64"
+	"os"
+
+	"github.com/getgauge-contrib/gauge-go/gauge"
+	"github.com/getgauge-contrib/gauge-go/testsuit"
+	"github.com/openshift-pipelines/release-tests/pkg/oc"
+)
+
+var _ = gauge.Step("Verify that jib-maven image registry variable is exported", func() {
+	if os.Getenv("jib_maven_repository") == "" {
+		testsuit.T.Errorf("'jib_maven_repository' environment variable is not exported")
+	}
+})
+
+var _ = gauge.Step("Create secret with image registry credentials for jib-maven", func() {
+	dockerConfigJson := oc.GetDockerConfigJson("quay-io-dockerconfig", "openshift-pipelines")
+	dockerConfig, err := base64.StdEncoding.DecodeString(dockerConfigJson)
+	if err != nil {
+		testsuit.T.Errorf("failed to decode docker config json: %v", err)
+	}
+	oc.CreateJibMavenImageRegistrySecret(string(dockerConfig))
+})

testdata/ecosystem/pipelineruns/jib-maven-pz.yaml

@@ -5,9 +5,15 @@ metadata:
 spec:
   pipelineRef:
     name: jib-maven-pipeline
+  params:
+  - name: jib_maven_repository
+    value: quay.io/openshift-pipeline/jib-maven
   workspaces:
   - name: source
     persistentVolumeClaim:
       claimName: shared-pvc
+  - name: dockerconfig
+    secret:
+      secretName: jib-maven-image-registry-credentials
   timeouts: 
     pipeline: 15m

testdata/ecosystem/pipelineruns/jib-maven.yaml

@@ -3,11 +3,17 @@ kind: PipelineRun
 metadata:
   name: jib-maven-run
 spec:
+  params:
+  - name: jib_maven_repository
+    value: quay.io/openshift-pipeline/jib-maven
   pipelineRef:
     name: jib-maven-pipeline
   workspaces:
   - name: source
     persistentVolumeClaim:
       claimName: shared-pvc
+  - name: dockerconfig
+    secret:
+      secretName: jib-maven-image-registry-credentials
   timeouts: 
     pipeline: 15m

testdata/ecosystem/pipelines/jib-maven-pz.yaml

@@ -4,6 +4,8 @@ metadata:
   name: jib-maven-pipeline
 spec:
   params:
+  - name: jib_maven_repository
+    description: The image repository to push to
   - name: SUBDIR
     description: where to clone the git repo
     default: jib-maven
@@ -13,13 +15,13 @@ spec:
   - name: clone-git-repo
     taskRef:
       resolver: cluster
-        params:
-        - name: kind
-          value: task
-        - name: name
-          value: git-clone
-        - name: namespace
-          value: openshift-pipelines
+      params:
+      - name: kind
+        value: task
+      - name: name
+        value: git-clone
+      - name: namespace
+        value: openshift-pipelines
     workspaces:
     - name: output
       workspace: source
@@ -33,13 +35,13 @@ spec:
   - name: build
     taskRef:
       resolver: cluster
-        params:
-        - name: kind
-          value: task
-        - name: name
-          value: jib-maven
-        - name: namespace
-          value: openshift-pipelines
+      params:
+      - name: kind
+        value: task
+      - name: name
+        value: jib-maven
+      - name: namespace
+        value: openshift-pipelines
     runAfter:
     - clone-git-repo
     workspaces:
@@ -49,7 +51,7 @@ spec:
     - name: DIRECTORY
       value: $(params.SUBDIR)
     - name: IMAGE
-      value: image-registry.openshift-image-registry.svc:5000/$(context.pipelineRun.namespace)/jib-maven
+      value: $(params.jib_maven_repository)
     - name: INSECUREREGISTRY
       value: "false"
     - name: MAVEN_IMAGE

testdata/ecosystem/pipelines/jib-maven.yaml

@@ -4,11 +4,15 @@ metadata:
   name: jib-maven-pipeline
 spec:
   params:
+  - name: jib_maven_repository
+    description: The image repository to push to
   - name: SUBDIR
     description: where to clone the git repo
     default: jib-maven
   workspaces:
   - name: source
+  - name: dockerconfig
+    optional: true
   tasks:
   - name: clone-git-repo
     taskRef:
@@ -47,10 +51,12 @@ spec:
     workspaces:
     - name: source
       workspace: source
+    - name: dockerconfig
+      workspace: dockerconfig
     params:
     - name: DIRECTORY
       value: $(params.SUBDIR)
     - name: IMAGE
-      value: image-registry.openshift-image-registry.svc:5000/$(context.pipelineRun.namespace)/jib-maven
+      value: $(params.jib_maven_repository)
     - name: INSECUREREGISTRY
       value: "false"