Merge branch 'master' of https://github.com/konkasoftci/azure-linux-automation

remote-scripts/ICA-BUILD-LINUX-NEXT-DEB-PACKAGE.ps1

@@ -87,7 +87,7 @@ if ($isDeployed)
               $KernelVersion = RunLinuxCmd -username $user -password $password -ip $hs1VIP -port $hs1vm1sshport -command "uname -r 2>&1" -runAsSudo
               LogMsg "Kernel Version : $KernelVersion"
               
-              Set-Content -Value "bash /home/$user/code/$($currentTestData.testScript) > /home/$user/code/linuxNextBuildTest.txt" -Path "$LogDir\StartTest.sh"
+              Set-Content -Value "bash /home/$user/code/$($currentTestData.testScript) $user > /home/$user/code/linuxNextBuildTest.txt" -Path "$LogDir\StartTest.sh"
               $out = RemoteCopy -uploadTo $hs1VIP -port $hs1vm1sshport -files ".\$LogDir\StartTest.sh" -username $user -password $password -upload
               $out = RunLinuxCmd -username $user -password $password -ip $hs1VIP -port $hs1vm1sshport -command "mv StartTest.sh /home/$user/code/" -runAsSudo
               $testJob = RunLinuxCmd -username $user -password $password -ip $hs1VIP -port $hs1vm1sshport -command "bash /home/$user/code/StartTest.sh" -runAsSudo -RunInBackground

remote-scripts/azuremodules.sh

@@ -39,7 +39,16 @@ function check_exit_status ()
 
 function detect_linux_ditribution_version()
 {
-    local  distro_version=`cat /etc/*release*|sed 's/"//g'|grep "VERSION_ID="| sed 's/VERSION_ID=//'| sed 's/\r//'`
+    local  distro_version="Unknown"
+    if [ -f /etc/os-release ] ; then
+        distro_version=`cat /etc/os-release|sed 's/"//g'|grep "VERSION_ID="| sed 's/VERSION_ID=//'| sed 's/\r//'`
+    elif [ -f /etc/centos-release ] ; then
+        distro_version=`cat /etc/centos-release | sed s/.*release\ // | sed s/\ .*//`
+    elif [ -f /etc/oracle-release ] ; then
+        distro_version=`cat /etc/oracle-release | sed s/.*release\ // | sed s/\ .*//`
+    elif [ -f /etc/redhat-release ] ; then
+        distro_version=`cat /etc/redhat-release | sed s/.*release\ // | sed s/\ .*//`
+    fi
     echo $distro_version
 }
 
@@ -67,7 +76,7 @@ function detect_linux_ditribution()
             linux_ditribution='unknown'
         fi
     fi
-    echo "${linux_ditribution^}"
+    echo "$(echo "$linux_ditribution" | sed 's/.*/\u&/')"
 }
 
 function updaterepos()

remote-scripts/build_deb_from_linux_next.sh

@@ -12,7 +12,8 @@ ICA_TESTFAILED="TestFailed"        # Error during running of test
 
 CONSTANTS_FILE="constants.sh"
 
-username=`cat /var/log/cloud-init.log | grep Adding| sed "s/.*user //"`
+#username=`cat /var/log/cloud-init.log | grep Adding| sed "s/.*user //"`
+username=$1
 current_kernel=`uname -r`
 code_path="/home/$username/code"
 . $code_path/azuremodules.sh

remote-scripts/customLISInstall.sh

@@ -85,6 +85,7 @@ elif [ "${customLIS}" == "netnext" ]; then
 	sourceDir="net-next"
 elif [[ $customLIS == *.rpm ]]; then
 	LogMsg "Custom LIS:$customLIS"
+	sed -i '/^exclude/c\#exclude' /etc/yum.conf
 	yum install -y wget tar
 	LogMsg "Debian package web link detected. Downloading $customLIS"
 	wget $customLIS
@@ -102,6 +103,7 @@ elif [[ $customLIS == *.rpm ]]; then
 	exit 0
 elif [[ $customLIS == *.tar.gz ]]; then
 	LogMsg "Custom LIS:$customLIS"
+	sed -i '/^exclude/c\#exclude' /etc/yum.conf
 	yum install -y git make tar gcc bc patch dos2unix wget xz >> ~/build-customLIS.txt 2>&1
 	LogMsg "LIS tar file web link detected. Downloading $customLIS"
 	wget $customLIS
@@ -129,6 +131,7 @@ if [ $DistroName == "SLES" -o $DistroName == "SUSE" ]; then
 	LogMsg "LIS doesn't support for $DistroName distro..."
 elif [ $DistroName == "CENTOS" -o $DistroName == "REDHAT" -o $DistroName == "FEDORA" -o $DistroName == "ORACLELINUX" ]; then
 	LogMsg "Installing packages git make tar gcc bc patch dos2unix wget ..."
+	sed -i '/^exclude/c\#exclude' /etc/yum.conf
 	yum install -y git make tar gcc bc patch dos2unix wget xz >> ~/build-customLIS.txt 2>&1
 	LogMsg "Downloading LIS source from ${LISSource}..."
 	git clone ${LISSource} >> ~/build-customLIS.txt 2>&1

remote-scripts/perf_fio.sh

@@ -167,9 +167,9 @@ RunFIO()
 
 ConfigCentOS7()
 {			
-	fioCentOS7pkg="fio-2.1.10-1.el7.rf.x86_64.rpm"
+	fioCentOS7pkg="fio-2.2.8-2.el7.x86_64.rpm"
 	LogMsg "INFO: CentOS7: installing required packages"
-	yum install -y wget sysstat mdadm blktrace
+	yum install -y wget sysstat mdadm blktrace libaio
 	mount -t debugfs none /sys/kernel/debug
 	
 	installed=`which fio`
@@ -178,7 +178,7 @@ ConfigCentOS7()
 
 		fiolPkg=$(ls | grep ${fioCentOS7pkg})
 		if [ -z "$fiolPkg" ]; then
-			wget "http://pkgs.repoforge.org/fio/${fioCentOS7pkg}"
+			wget "https://konkasoftpackages.blob.core.windows.net/linuxbinaries/${fioCentOS7pkg}"
 		fi
 		yum install -y ${fioCentOS7pkg}
         if [ $? -ne 0 ]; then
@@ -192,7 +192,7 @@ ConfigCentOS6()
 {			
 	fioCentOS6pkg="fio-2.1.10-1.el6.rf.x86_64.rpm"
 	LogMsg "INFO: CentOS6: installing required packages"
-	yum install -y wget sysstat mdadm blktrace
+	yum install -y wget sysstat mdadm blktrace libaio
 	mount -t debugfs none /sys/kernel/debug
 	
 	installed=`which fio`
@@ -201,7 +201,7 @@ ConfigCentOS6()
 
 		fiolPkg=$(ls | grep ${fioCentOS6pkg})
 		if [ -z "$fiolPkg" ]; then			
-			wget "http://pkgs.repoforge.org/fio/${fioCentOS6pkg}"
+			wget "https://konkasoftpackages.blob.core.windows.net/linuxbinaries/${fioCentOS6pkg}"
 		fi
 		yum install -y libibverbs.x86_64
 		yum install -y ${fioCentOS6pkg}
@@ -347,7 +347,8 @@ mountDir="/data"
 cd ${HOMEDIR}
 
 #DISTRO=`grep -ihs "Ubuntu\|Suse\|Fedora\|Debian\|CentOS\|Red Hat Enterprise Linux" /etc/{issue,*release,*version} | grep DISTRIB_ID= | sed s/DISTRIB_ID=//`
-DISTRO="Ubuntu"
+DISTRO=`grep -ihs "Ubuntu\|Suse\|Fedora\|Debian\|CentOS\|Red Hat Enterprise Linux" /etc/{issue,*release,*version}`
+#DISTRO="Ubuntu"
 echo "###############$DISTRO########################"
 case $DISTRO in
 	Ubuntu*)