ASGARD-893 Home page footer and /server/change should show GIT_COMMIT…

…, not P4_CHANGE
mkrogemann · Jun 18, 2012 · c5c15af · c5c15af
1 parent 6e63b20
commit c5c15af
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/grails-app/controllers/com/netflix/asgard/ServerController.groovy b/grails-app/controllers/com/netflix/asgard/ServerController.groovy
@@ -43,7 +43,7 @@ import grails.converters.XML
 
     def build = { render "${grailsApplication.config.build.number}" }
 
-    def change = { render "${grailsApplication.config.sync.change}" }
+    def change = { render "${grailsApplication.config.scm.commit}" }
 
     def waitingToMoveTraffic = { render "${serverService.isThisServerWaitingToMoveTraffic()}" }
 

diff --git a/grails-app/views/home/index.gsp b/grails-app/views/home/index.gsp
@@ -123,7 +123,7 @@
         Discovery: There is no Discovery URL for <strong>${grailsApplication.config.cloud.accountName}</strong> in <strong>${region}</strong>
       </g:else>
       <p>Hostname: ${InetAddress.localHost.hostName}, IP: ${InetAddress.localHost.hostAddress}</p>
-      <p>Build: id=${grailsApplication.config.build.id} build#${grailsApplication.config.build.number} @${grailsApplication.config.sync.change}</p>
+      <p>Build: id=${grailsApplication.config.build.id} build#${grailsApplication.config.build.number} @${grailsApplication.config.scm.commit}</p>
     </div>
   </div>
 </body>

diff --git a/scripts/Events.groovy b/scripts/Events.groovy
@@ -21,7 +21,7 @@
 eventCompileEnd = { kind ->
     String sourceVersionFile = "${classesDirPath}/sourceVersion.properties"
     ant.propertyfile(file: sourceVersionFile) {
-        entry(key: 'sync.change', value: System.getenv('P4_CHANGELIST') ?: '')
+        entry(key: 'scm.commit', value: System.getenv('GIT_COMMIT') ?: '')
         entry(key: 'build.id', value: System.getenv('BUILD_ID') ?: '')
         entry(key: 'build.number', value: System.getenv('BUILD_NUMBER') ?: '')
     }