Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 19 additions & 3 deletions netci.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ def project = GithubProject
def branch = GithubBranchName
def isPR = true

def platformList = ['Debian8.2:x64:Debug', 'PortableLinux:x64:Release', 'Ubuntu:arm:Release', 'Ubuntu:x64:Release', 'Ubuntu16.04:x64:Release', 'Ubuntu16.10:x64:Release', 'OSX:x64:Release', 'Windows_NT:x64:Release', 'Windows_NT:x86:Debug', 'Windows_NT:arm:Debug', 'RHEL7.2:x64:Release', 'CentOS7.1:x64:Debug', 'Fedora23:x64:Debug', 'OpenSUSE42.1:x64:Debug']
def platformList = ['Debian8.2:x64:Debug', 'PortableLinux:x64:Release', 'Ubuntu:arm:Release', 'Ubuntu:x64:Release', 'Ubuntu16.04:arm:Release', 'Ubuntu16.04:x64:Release', 'Ubuntu16.10:x64:Release', 'OSX:x64:Release', 'Windows_NT:x64:Release', 'Windows_NT:x86:Debug', 'Windows_NT:arm:Debug', 'RHEL7.2:x64:Release', 'CentOS7.1:x64:Debug', 'Fedora23:x64:Debug', 'OpenSUSE42.1:x64:Debug']

def static getBuildJobName(def configuration, def os, def architecture) {
return configuration.toLowerCase() + '_' + os.toLowerCase() + '_' + architecture.toLowerCase()
Expand Down Expand Up @@ -41,9 +41,18 @@ platformList.each { platform ->
}
else if ((os.startsWith("Ubuntu") || os.startsWith("Tizen")) &&
(architecture == 'arm' || architecture == 'armel')) {
version = "arm-cross-latest"
def linuxcodename = '';
if (os == 'Ubuntu') {
version = "arm-cross-latest"
linuxcodename = 'trusty'
}
else if (os == 'Ubuntu16.04') {
version = "latest-or-auto-docker"
linuxcodename = 'xenial'
}

// Call the arm32_ci_script.sh script to perform the cross build by using docker
buildCommand = "./scripts/arm32_ci_script.sh --buildConfig=${configuration} --verbose"
buildCommand = "./scripts/arm32_ci_script.sh --buildConfig=${configuration} --${architecture} --linuxCodeName=${linuxcodename} --verbose"
}
else if (os == 'Ubuntu') {
buildCommand = "./build.sh --skip-prereqs --configuration ${configuration} --docker ubuntu.14.04 --targets Default"
Expand Down Expand Up @@ -75,6 +84,13 @@ platformList.each { platform ->
}
}

// Currently Ubuntu16.04 ARM CI build is disabled,
// so it can't collect the results files like testResults.xml and archives.
// This line will be removed ASAP.
if (os == 'Ubuntu16.04' && architecture == 'arm') {
return;
}

Utilities.setMachineAffinity(newJob, os, version)
Utilities.standardJobSetup(newJob, project, isPR, "*/${branch}")

Expand Down
6 changes: 6 additions & 0 deletions scripts/arm32_ci_script.sh
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,12 @@ do
esac
done

if [[ $__linuxCodeName == "xenial" || $__linuxCodeName == "tizen" ]]; then
# This case does not support CI build yet.

This comment was marked as spam.

This comment was marked as spam.

# Will be enabled ASAP.
exit 0
fi

#Check if there are any uncommited changes in the source directory as git adds and removes patches
if [[ $(git status -s) != "" ]]; then
echo 'ERROR: There are some uncommited changes. To avoid losing these changes commit them and try again.'
Expand Down