#56 Remove unused line and add MESSAGE_HEADERS parameter
Merged 4 years ago by mkovarik. Opened 4 years ago by mkovarik.
mkovarik/c3i-library jms-headers  into  master

@@ -53,8 +53,8 @@ 

        - name: {{ param.name }}

          value: {{ param.value }}

  {% endfor %}

-       # CI_MESSAGE is used internally by JMS messaging plugin

+       # CI_MESSAGE and MESSAGE_HEADERS are used internally by JMS messaging plugin

        - name: CI_MESSAGE

-         value:

+       - name: MESSAGE_HEADERS

        jenkinsfile: |

          {% filter indent(width=10) %}{% include "templates/build.Jenkinsfile" %}{% endfilter %}

@@ -39,8 +39,8 @@ 

          value: {{ c3i_messaging_topic_consumer_part }}.c3i-{{ item }}-{{ job_vars.name_post }}{{ c3i_test_subscriber }}.{{ c3i_messaging_greenwave_topic_virtualtopic_part }}

        - name: MAIL_ADDRESS

          value: {{ c3i_mail_address }}

-       # CI_MESSAGE is used internally by JMS messaging plugin

+       # CI_MESSAGE and MESSAGE_HEADERS are used internally by JMS messaging plugin

        - name: CI_MESSAGE

-         value:

+       - name: MESSAGE_HEADERS

        jenkinsfile: |

          {% filter indent(width=10) %}{% include "templates/greenwave-promote.Jenkinsfile" %}{% endfilter %}

@@ -43,8 +43,8 @@ 

        - name: {{ param.name }}

          value: {{ param.value }}

  {% endfor %}

-       # CI_MESSAGE is used internally by JMS messaging plugin

+       # CI_MESSAGE and MESSAGE_HEADERS are used internally by JMS messaging plugin

        - name: CI_MESSAGE

-         value:

+       - name: MESSAGE_HEADERS

        jenkinsfile: |

          {% filter indent(width=10) %}{% include "templates/trigger-on-tag.Jenkinsfile" %}{% endfilter %}

file modified
-2
@@ -13,8 +13,6 @@ 

  PLUGINS=$(curl https://raw.githubusercontent.com/openshift/jenkins/master/2/contrib/openshift/base-plugins.txt | grep -v "#" |grep -v '^$' | sed 's/:.*/:latest/')

  PLUGINS=$(echo -e "$PLUGINS\n$(cat jenkins-plugins.txt)" | sort -u | tr '\n' ',')

  

- cat jenkins-plugins.txt | tr '\n' ',' >> default-jenkins-plugins.txt

- 

  oc create configmap openshift-jenkins-login-plugin-config --from-literal Overall-Administer=view

  

  oc new-app --file=jenkins-template.yaml \

@@ -31,8 +31,10 @@ 

          value: c3iaas-request-project

        - name: PAAS_DOMAIN

          value: cloud.paas.psi.redhat.com

-       - name: CI_MESSAGE

        - name: JENKINS_AGENT_SERVICE_ACCOUNT

          value: jenkins

+       # CI_MESSAGE and MESSAGE_HEADERS are used internally by JMS messaging plugin

+       - name: CI_MESSAGE

+       - name: MESSAGE_HEADERS

        jenkinsfile: |

          {% filter indent(width=10) %}{% include "c3i-role-verification.Jenkinsfile" %}{% endfilter %}