get opendsbuildId... evenif installation phase is not run

andrug

18.53.2008 25b22ff6a9e047dcfdc4b11910591a0a50db11eb

get opendsbuildId... evenif installation phase is not run

 opends/tests/system-tests/phases/installation/installation_opends.xml

@@ -105,10 +105,11 @@
      
      
      <!--== Update missing parameters -->
      <iterate in="instances" var="instance">
      <call function="'updateMissingParameters'">
      {'instances' : instances}
        {'instance' : instance}
      </call>
      
      </iterate>
    </sequence>
  </function>  

@@ -375,15 +376,11 @@
  <!-- ************************************************************ -->
  <function name="updateMissingParameters" scope="local">
    <function-map-args>
      <function-arg-def name="instances" type="required">
      <function-arg-def name="instance" type="required">
      </function-arg-def>
    </function-map-args>
    
    <sequence>
      <!--========  Update missing parameters   ======-->
      <iterate in="instances" var="instance">
        <sequence>
        
          <!--== Get instance informations ==-->
          <process name="'%s: Get server infos' % instance.getName()">
            <location>instance.getHost()</location>
@@ -427,9 +424,35 @@
            instance.setOs(os)
          </script>
        </sequence>
      </iterate>
    </sequence>
  </function>
  
  
  
  
  <!-- ************************************************************ -->
  <function name="getOpendsBuildID" scope="local">
    <function-map-args>
      <function-arg-def name="instance" type="required">
      </function-arg-def>
    </function-map-args>
    
    <sequence>
      <!--====  get build id if instance has already been installed  ====-->
      <call function="'isFile'">
      {
        'location' : instance.getHost(),
        'fileName' : instance.getInstallDir()
      }
      </call>
      <script>
        installDirExist = STAXResult
      </script>
      <!--== if installDir exists, get buildID ==-->
      <if expr="installDirExist == TRUE">
        <call function="'updateMissingParameters'">
          {'instance' : instance}
        </call>
      </if>
    </sequence>
 </function>
</stax>

 opends/tests/system-tests/phases/main_run_lib.xml

@@ -100,7 +100,6 @@
        '=================== PREAMBLE  ========================='
      </message>
      
      
      <!--== Do some stuff on instances machines ==-->
      <paralleliterate in="instances" var="instance">
        <sequence>
@@ -126,6 +125,17 @@
              'fileFd'     : NO_FILE
            }
          </call>
          <!--== Get opends buildid is instance is already installed ==-->
          <if expr="instance.getProduct() == 'opends'">
            <sequence>
              <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
               file="'%s/phases/installation/installation_opends.xml' %
               (TESTS_DIR)"/>
              <call function="'getOpendsBuildID'">
                { 'instance' : instance }
              </call>
            </sequence>
          </if>
        </sequence>
      </paralleliterate>
      

 opends/tests/system-tests/phases/parser/parser.py

@@ -267,7 +267,6 @@
    self.portJMX     = portJMX
    self.portREPL    = portREPL
    self.javaVersion = NOT_DEFINED
    self.buildId     = NOT_DEFINED
    
  def getProduct(self):
    return self.product