FT-150: (#545)

Add instruction for local debugging
Add logic to fail on error
Add parameters to easily overwrite image name, version and registry

Signed-off-by: Laurent <[email protected]>

Author: lrochette

incubating/pipeline-trigger-merge/README.md

@@ -49,4 +49,23 @@ MergeTriggersIntoPipelines:
     SPEC: spec.yml
     ONLY_CHANGED: true
     TRIGGERS_SUBDIR: "triggers"
-```
+```
+
+## Testing and Debugging
+
+In order to speed up development (or debugging), we recommend to run the image
+locally and mounting the your local folder to your container.
+
+To do that,
+
+1. we will be running docker run (be sure the daemon is running on your local box)
+2. mount local folder there your spec and triggers are located
+3. mount the .cfconfig file (to be able to call the CLI)
+4. Pass variables as environment variables
+
+```sh
+docker run -v ~/.cfconfig:/root/.cfconfig -v $(pwd)/sample:/foo \
+  -e SPEC=/foo/spec.yml \
+  -e TRIGGERS='/foo/TRIGGERS /foo/trig1.yml' \
+  quay.io/codefreshplugins/pipeline-trigger-merge:1.1.0
+```

incubating/pipeline-trigger-merge/merge.sh

@@ -1,4 +1,4 @@
-#/bin/#!/usr/bin/env bash
+#!/bin/bash
 
 process_dir() {
   echo  "Processing trigger directory $1"
@@ -25,11 +25,40 @@ process_file() {
   fi
   echo "WARNING: Unknown trigger file $1"
 }
-export curdir=`pwd`
-export count=1
+
+# exit on error
+set -e
+echo "pipeline-trigger-merge v1.1.0"
+
+count=1
 echo "Merging pipeline spec $SPEC with triggers $TRIGGERS"
 for f in `echo $TRIGGERS` ; do
+    # is path absolute
+    if [[ "$f" = /* ]] ; then
+      curdir="/"
+    else
+      curdir=`pwd`
+    fi
     process_file $f
 done
+
 echo "Creating/Updating final pipeline"
-codefresh create pipeline -f $SPEC || codefresh replace -f $SPEC
+
+# Get pipeline name
+echo "Checking if pipeline already exists"
+name=$(yq '.metadata.name' $SPEC)
+codefresh get pip $name > pipeline.log 2>&1 || true
+
+#Check if pipeline exists
+if [ `grep -c PIPELINE_NOT_FOUND pipeline.log` -eq 0 ] ; then
+  echo "Updating final pipeline"
+  cmd="codefresh replace -f $SPEC"
+else
+  echo "Creating final pipeline"
+  cmd="codefresh create pipeline -f $SPEC"
+fi
+
+# Check for error when creating/updating the pipeline
+echo "Checking for errors"
+$cmd 2>&1 | tee pipeline.log
+exit `grep -c 'Yaml validation errors' pipeline.log`

incubating/pipeline-trigger-merge/sample/spec.yml

@@ -27,6 +27,7 @@ spec:
     build:
       title: "Building Docker image"
       type: "build"
+      registry: docker
       image_name: "codefresh-io/cli"
       working_directory: "${{clone}}"
       tag: "latest"

incubating/pipeline-trigger-merge/step.yaml

@@ -2,7 +2,7 @@ kind: step-type
 version: '1.0'
 metadata:
   name: pipeline-trigger-merge
-  version: 1.0.2
+  version: 1.1.0
   isPublic: true
   description: >-
     Merge a pipeline spec and a list of triggers (files or directories) to
@@ -65,14 +65,29 @@ spec:
         "TRIGGERS_SUBDIR": {
           "type": "string",
           "description": "The subdirectory that holds a pipeline's triggers if looping. Defaults to 'triggers'."
+        },
+        "REGISTRY": {
+          "type": "string",
+          "description": "Docker Registry for step's image.",
+          "default": "quay.io"
+        },
+        "IMAGE": {
+          "type": "string",
+          "description": "Image name for step's image.",
+          "default": "codefreshplugins/pipeline-trigger-merge"
+        },
+        "IMAGE_TAG": {
+          "type": "string",
+          "description": "Image tag for step's image.",
+          "default": "1.1.0"
         }
       }
     }
 
   stepsTemplate: |-
     pipeline-trigger-merge:
       name: pipeline-trigger-merge
-      image: quay.io/codefreshplugins/pipeline-trigger-merge:1.0.2
+      image: '[[.Arguments.REGISTRY]]/[[.Arguments.IMAGE]]:[[.Arguments.IMAGE_TAG]]'
       environment:
       [[ range $key, $val := .Arguments ]]
         - '[[ $key ]]=[[ $val ]]'