Sfoglia il codice sorgente

AMBARI-3002. Add git hash to the rpm build - a file which has the latest git hash in it. (Dmytro Shkvyra via dlysnichenko)

Lisnichenko Dmitro 12 anni fa
parent
commit
5cd2cde22b

+ 14 - 0
ambari-agent/conf/unix/ambari-agent

@@ -19,6 +19,20 @@
 
 
 # /etc/init.d/ambari-agent
 # /etc/init.d/ambari-agent
 
 
+VERSION="${ambariVersion}"
+HASH="${buildNumber}"
+
+case "$1" in
+  --version)
+        echo -e $VERSION
+        exit 0
+        ;;
+  --hash)
+        echo -e $HASH
+        exit 0
+        ;;
+esac
+
 export PATH=/usr/lib/ambari-server/*:$PATH
 export PATH=/usr/lib/ambari-server/*:$PATH
 export AMBARI_CONF_DIR=/etc/ambari-server/conf:$PATH
 export AMBARI_CONF_DIR=/etc/ambari-server/conf:$PATH
 
 

+ 17 - 0
ambari-agent/pom.xml

@@ -262,6 +262,7 @@
               <sources>
               <sources>
                 <source>
                 <source>
                   <location>conf/unix/ambari-agent</location>
                   <location>conf/unix/ambari-agent</location>
+                  <filter>true</filter>
                 </source>
                 </source>
               </sources>
               </sources>
             </mapping>
             </mapping>
@@ -380,6 +381,22 @@
           </excludes>
           </excludes>
         </configuration>
         </configuration>
       </plugin>
       </plugin>
+      <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>buildnumber-maven-plugin</artifactId>
+          <version>${buildnumber-maven-plugin-version}</version>
+          <configuration>
+              <urlScm>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-ambari.git</urlScm>
+          </configuration>    
+          <executions>
+              <execution>
+                  <phase>validate</phase>
+                  <goals>
+                      <goal>create</goal>
+                  </goals>
+              </execution>
+          </executions>
+      </plugin>      
     </plugins>
     </plugins>
     <extensions>
     <extensions>
       <extension>
       <extension>

+ 17 - 0
ambari-server/pom.xml

@@ -224,6 +224,7 @@
                 </source>
                 </source>
                 <source>
                 <source>
                   <location>sbin/ambari-server</location>
                   <location>sbin/ambari-server</location>
+                  <filter>true</filter>
                 </source>
                 </source>
               </sources>
               </sources>
             </mapping>
             </mapping>
@@ -453,6 +454,22 @@
         </configuration>
         </configuration>
         -->
         -->
       </plugin>
       </plugin>
+      <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>buildnumber-maven-plugin</artifactId>
+          <version>${buildnumber-maven-plugin-version}</version>
+          <configuration>
+              <urlScm>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-ambari.git</urlScm>
+          </configuration>    
+          <executions>
+              <execution>
+                  <phase>validate</phase>
+                  <goals>
+                      <goal>create</goal>
+                  </goals>
+              </execution>
+          </executions>
+      </plugin>      
     </plugins>
     </plugins>
     <resources>
     <resources>
       <resource>
       <resource>

+ 14 - 0
ambari-server/sbin/ambari-server

@@ -21,6 +21,20 @@
 
 
 # /etc/init.d/ambari-server
 # /etc/init.d/ambari-server
 
 
+VERSION="${ambariVersion}"
+HASH="${buildNumber}"
+
+case "$1" in
+  --version)
+        echo -e $VERSION
+        exit 0
+        ;;
+  --hash)
+        echo -e $HASH
+        exit 0
+        ;;
+esac
+
 export PATH=/usr/lib/ambari-server/*:$PATH
 export PATH=/usr/lib/ambari-server/*:$PATH
 export AMBARI_CONF_DIR=/etc/ambari-server/conf:$PATH
 export AMBARI_CONF_DIR=/etc/ambari-server/conf:$PATH
 
 

+ 1 - 0
pom.xml

@@ -26,6 +26,7 @@
   <properties>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <clover.license>${user.home}/clover.license</clover.license>
     <clover.license>${user.home}/clover.license</clover.license>
+    <buildnumber-maven-plugin-version>1.2</buildnumber-maven-plugin-version>
   </properties>
   </properties>
   <pluginRepositories>
   <pluginRepositories>
     <pluginRepository>
     <pluginRepository>