Merge pull request #1187 from jenkins-infra/staging

Automated deployment to production
jenkins-infra · Oct 30, 2018 · 947a768 · 947a768
2 parents a503eae + 35546f4
commit 947a768
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/dist/profile/manifests/kubernetes/resources/evergreen_gateway.pp b/dist/profile/manifests/kubernetes/resources/evergreen_gateway.pp
@@ -50,7 +50,7 @@
 
     # Template evergreen profile file
     $profile = @("PROFILE"/L$)
-      export DB_HOST==${db_host}
+      export DB_HOST=${db_host}
       export DB_PORT=${db_port}
       export DB_USER=${db_user}
       export DB_NAME=${db_name}

diff --git a/dist/profile/templates/kubernetes/resources/chatbot_jenkinsadmin/deployment.yaml.erb b/dist/profile/templates/kubernetes/resources/chatbot_jenkinsadmin/deployment.yaml.erb
@@ -18,7 +18,10 @@ spec:
                   image: jenkinsciinfra/ircbot:<%= @parameters['image_tag'] %>
                   imagePullPolicy: IfNotPresent
                   # A shell is required to load $NICK_PASSWORD env variable
-                  args: ["$NICK_PASSWORD"]
+                  # For a reason that I can't understand, the java command must be defined as an argument otherwise it doesn't take into account the $NICK_PASSWORD parameter
+                  command: ["/tini","--","/bin/sh","-c"]
+                  args: ["java -Dircbot.name=jenkins-admin -jar /usr/local/bin/ircbot-2.0-SNAPSHOT.jar $NICK_PASSWORD"]
+
                   env:
                     - name: NICK_PASSWORD
                       valueFrom:

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
@@ -89,7 +89,8 @@ profile::accountapp::smtp_password: ENC[PKCS7,MIIBmQYJKoZIhvcNAQcDoIIBijCCAYYCAQ
 # BIND container to deploy.
 profile::bind::image_tag: '15-237a33'
 
-irc::irc_server: 'irc://infra-butler@irc.freenode.net/#jenkins-infra'
+irc::irc_server: ENC[PKCS7,MIIBuQYJKoZIhvcNAQcDoIIBqjCCAaYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAHKHAdkfe6JOYrRTa0fkos70NiLX7KNceJiFbtj7wXTZYZcHxMySufm0MHhNTbRA8PYTnlHgff1dQxMj0iIQ7uSH5jHgYLuyCkbTw/xXYVrEQozb/I5xe9IBrl+ot4ctra/fCC6q//Wf+xuJQ4DzAkrmPK041dORSh8mw31HkSdcL3EvzV8dEOXqJHhgIuyskAWNoyq1nHjU44+93yh9x9s/FvOMt4tQ+odquUeVvcnpcpeT2rWyg075otE+r4kJI2LAhINwo1oCdaUL8WZK4E2l6asMVYQFCohJfoIJpNh9bc5HWNfxcU4Var4pGSbl4JlM//dV/EABQcYEg7hvwkDB8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAH4ik2W0sBT5z+yJhU1SvVgFDCilHva0EW+lnE0c10kWfc5e3fwkg+W3fvtt7xOZp8jOMAgGFnnPD3C9v9+tJk0EjJmQ05fXlbTl0nAH62ZSLQNc7/C6bKKutknGKcJBfdEQ==]
+irc::register_first: true
 irc::irc_join: true
 irc::timeout: 20