commit 10b8ff18be4d721d621987e39042d7d1d370cbd6
author Zack Williams <zdw@opennetworking.org> Fri Sep 14 20:59:05 2018 +0000
committer Gerrit Code Review <gerrit@opencord.org> Fri Sep 14 20:59:05 2018 +0000
tree 181cc2e93b8680e35fb4a339f4836915f02434a1
parent 67950e6a69a5686c505ad1610dd122911f59e896
parent 9b6b5eb554bb878841af50b614d13467ec64576b

Merge "fix heredoc indent and braces"

jjb/pipeline/all-xos-api-test-helm.groovy

diff --git a/jjb/pipeline/all-xos-api-test-helm.groovy b/jjb/pipeline/all-xos-api-test-helm.groovy
index 4e1384b..73e9dd7 100644
--- a/jjb/pipeline/all-xos-api-test-helm.groovy
+++ b/jjb/pipeline/all-xos-api-test-helm.groovy
@@ -137,13 +137,13 @@
            done
 
            # create values file with core version tags
+           # not indented because heredoc requires it
            cat << EOF > \${WORKSPACE}/xos_tags.yaml
-           ---
-           xos_coreImage: 'xosproject/xos-core:\$(XOS_VERSION}'
-           xos_chameleonImage: 'xosproject/chameleon:\$(XOS_VERSION}'
-           xos_toscaImage: 'xosproject/xos-tosca:\$(XOS_VERSION}'
-
-           EOF
+---
+xos_coreImage: 'xosproject/xos-core:\${XOS_VERSION}'
+xos_chameleonImage: 'xosproject/chameleon:\${XOS_VERSION}'
+xos_toscaImage: 'xosproject/xos-tosca:\${XOS_VERSION}'
+EOF
            """
       }
     }

jjb/pipeline/xos-synchronizer-update.groovy

diff --git a/jjb/pipeline/xos-synchronizer-update.groovy b/jjb/pipeline/xos-synchronizer-update.groovy
index 96251d9..a4c715e 100644
--- a/jjb/pipeline/xos-synchronizer-update.groovy
+++ b/jjb/pipeline/xos-synchronizer-update.groovy
@@ -133,13 +133,13 @@
            done
 
            # create values file with core version tags
+           # not indented because heredoc requires it
            cat << EOF > \${WORKSPACE}/xos_tags.yaml
-           ---
-           xos_coreImage: 'xosproject/xos-core:\$(XOS_VERSION}'
-           xos_chameleonImage: 'xosproject/chameleon:\$(XOS_VERSION}'
-           xos_toscaImage: 'xosproject/xos-tosca:\${XOS_VERSION}'
-
-           EOF
+---
+xos_coreImage: 'xosproject/xos-core:\${XOS_VERSION}'
+xos_chameleonImage: 'xosproject/chameleon:\${XOS_VERSION}'
+xos_toscaImage: 'xosproject/xos-tosca:\${XOS_VERSION}'
+EOF
            """
       }
     }