From c6eb85832971c1b247ca383f3051256d1049fc9f Mon Sep 17 00:00:00 2001 From: Dan Moseley Date: Mon, 8 May 2017 22:32:52 -0700 Subject: [PATCH] Add windows 7 --- netci.groovy | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/netci.groovy b/netci.groovy index fcae705f145d..6c1956fd115b 100644 --- a/netci.groovy +++ b/netci.groovy @@ -13,13 +13,16 @@ def projectFolder = Utilities.getFolderName(project) + '/' + Utilities.getFolder // Globals // Map of osName -> osGroup. -def osGroupMap = ['Ubuntu14.04':'Linux', +def osGroupMap = ['Windows 10':'Windows_NT', + 'Windows 7':'Windows_NT', + 'Windows_NT':'Windows_NT', + 'Windows Nano 2016' : 'Windows_NT', + 'Ubuntu14.04':'Linux', 'Ubuntu16.04':'Linux', 'Ubuntu16.10':'Linux', 'Debian8.4':'Linux', 'Fedora24':'Linux', 'OSX10.12':'OSX', - 'Windows_NT':'Windows_NT', 'CentOS7.1': 'Linux', 'OpenSUSE13.2': 'Linux', 'OpenSUSE42.1': 'Linux', @@ -31,16 +34,16 @@ def osGroupMap = ['Ubuntu14.04':'Linux', def osShortName = ['Windows 10': 'win10', 'Windows 7' : 'win7', 'Windows_NT' : 'windows_nt', - 'Ubuntu14.04' : 'ubuntu14.04', - 'OSX10.12' : 'osx', 'Windows Nano 2016' : 'winnano16', + 'Ubuntu14.04' : 'ubuntu14.04', 'Ubuntu16.04' : 'ubuntu16.04', 'Ubuntu16.10' : 'ubuntu16.10', - 'CentOS7.1' : 'centos7.1', 'Debian8.4' : 'debian8.4', + 'Fedora24' : 'fedora24', + 'OSX10.12' : 'osx', + 'CentOS7.1' : 'centos7.1', 'OpenSUSE13.2' : 'opensuse13.2', 'OpenSUSE42.1' : 'opensuse42.1', - 'Fedora24' : 'fedora24', 'RHEL7.2' : 'rhel7.2', 'PortableLinux' : 'portablelinux']