Support separate LIS package for 32bit and 64bit LIS

CreatePBuild-IP-Files.ps1

@@ -1,6 +1,7 @@
 param (
     $ResourceGroupName="",
-    $secretsFile=""
+    $secretsFile="",
+    $arch=""
 )
 
 Function Register-AzureSubscription($secretsFile) {
@@ -117,6 +118,10 @@ $Counter = 0
 $NICs = Get-AzureRmNetworkInterface -ResourceGroupName $ResourceGroupName
 $IPS = $null
 foreach ($nic in $NICs) {
+    if($nic.Name -inotmatch $arch) {
+        continue
+    }
+
     $counter ++
     if($nic.Name.Split("_")[3].StartsWith("5")) {
         $RH5PbuildFile += "host:`tCentOS5.xVM$RH5VMCount`t$($nic.IpConfigurations.PrivateIpAddress)`t~/rpmbuild/SOURCES`tom`n"
@@ -143,4 +148,4 @@ foreach ($nic in $NICs) {
 Set-Content -Value $RH5PbuildFile -Path .\RH5.pbuild -Force -Verbose
 Set-Content -Value $RH6PbuildFile -Path .\RH6.pbuild -Force -Verbose
 Set-Content -Value $RH7PbuildFile -Path .\RH7.pbuild -Force -Verbose
-Set-Content -Value $IPS -Path .\ips.sh -Force -Verbose
+Set-Content -Value $IPS -Path .\ips.sh -Force -Verbose

copyall.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+arch="$1"
+
 #source the ips.sh
 . ./ips.sh
 
@@ -72,9 +74,10 @@ for line in $ips_contents; do
 
     #Copy the SRPMs
     if [[ x"$lis_srpm_build_destination" != x ]];then
-        #Copy only one source rpm for 64 bit and 32 bit rpms.
-        if [ $arch_source_dir != "i686" ];then
-	    scp -r root@${ip}:${lis_srpm_source}/* $lis_srpm_build_destination
-        fi
+        scp -r root@${ip}:${lis_srpm_source}/* $lis_srpm_build_destination
     fi
+
+    # For 32 bit build RPMS7X folders are not required and should be cleaned up.
+    [[ ! -z ${arch} && ${arch} == "x32" ]] && rm -rf LISISO/RPMS7* || echo "${arch} build"
+
 done