Remove Hydra scheduling priorities
They're not so important anymore now that Hydra has jobset scheduling.
This commit is contained in:
		
							parent
							
								
									048ec3d3f2
								
							
						
					
					
						commit
						fe37ed1219
					
				
					 1 changed files with 26 additions and 28 deletions
				
			
		
							
								
								
									
										54
									
								
								release.nix
									
										
									
									
									
								
							
							
						
						
									
										54
									
								
								release.nix
									
										
									
									
									
								
							|  | @ -181,33 +181,31 @@ let | |||
|       }; | ||||
| 
 | ||||
| 
 | ||||
|     rpm_fedora16i386 = makeRPM_i686 (diskImageFuns: diskImageFuns.fedora16i386) 50; | ||||
|     rpm_fedora16x86_64 = makeRPM_x86_64 (diskImageFunsFun: diskImageFunsFun.fedora16x86_64) 50; | ||||
|     rpm_fedora18i386 = makeRPM_i686 (diskImageFuns: diskImageFuns.fedora18i386) 60; | ||||
|     rpm_fedora18x86_64 = makeRPM_x86_64 (diskImageFunsFun: diskImageFunsFun.fedora18x86_64) 60; | ||||
|     rpm_fedora19i386 = makeRPM_i686 (diskImageFuns: diskImageFuns.fedora19i386) 70; | ||||
|     rpm_fedora19x86_64 = makeRPM_x86_64 (diskImageFunsFun: diskImageFunsFun.fedora19x86_64) 70; | ||||
|     rpm_fedora20i386 = makeRPM_i686 (diskImageFuns: diskImageFuns.fedora20i386) 70; | ||||
|     rpm_fedora20x86_64 = makeRPM_x86_64 (diskImageFunsFun: diskImageFunsFun.fedora20x86_64) 70; | ||||
|     rpm_fedora16i386 = makeRPM_i686 (diskImageFuns: diskImageFuns.fedora16i386); | ||||
|     rpm_fedora16x86_64 = makeRPM_x86_64 (diskImageFunsFun: diskImageFunsFun.fedora16x86_64); | ||||
|     rpm_fedora18i386 = makeRPM_i686 (diskImageFuns: diskImageFuns.fedora18i386); | ||||
|     rpm_fedora18x86_64 = makeRPM_x86_64 (diskImageFunsFun: diskImageFunsFun.fedora18x86_64); | ||||
|     rpm_fedora19i386 = makeRPM_i686 (diskImageFuns: diskImageFuns.fedora19i386); | ||||
|     rpm_fedora19x86_64 = makeRPM_x86_64 (diskImageFunsFun: diskImageFunsFun.fedora19x86_64); | ||||
|     rpm_fedora20i386 = makeRPM_i686 (diskImageFuns: diskImageFuns.fedora20i386); | ||||
|     rpm_fedora20x86_64 = makeRPM_x86_64 (diskImageFunsFun: diskImageFunsFun.fedora20x86_64); | ||||
| 
 | ||||
| 
 | ||||
|     #deb_debian60i386 = makeDeb_i686 (diskImageFuns: diskImageFuns.debian60i386) 50; | ||||
|     #deb_debian60x86_64 = makeDeb_x86_64 (diskImageFunsFun: diskImageFunsFun.debian60x86_64) 50; | ||||
|     deb_debian7i386 = makeDeb_i686 (diskImageFuns: diskImageFuns.debian7i386) 60; | ||||
|     deb_debian7x86_64 = makeDeb_x86_64 (diskImageFunsFun: diskImageFunsFun.debian7x86_64) 60; | ||||
|     deb_debian7i386 = makeDeb_i686 (diskImageFuns: diskImageFuns.debian7i386); | ||||
|     deb_debian7x86_64 = makeDeb_x86_64 (diskImageFunsFun: diskImageFunsFun.debian7x86_64); | ||||
| 
 | ||||
|     deb_ubuntu1204i386 = makeDeb_i686 (diskImageFuns: diskImageFuns.ubuntu1204i386) 60; | ||||
|     deb_ubuntu1204x86_64 = makeDeb_x86_64 (diskImageFuns: diskImageFuns.ubuntu1204x86_64) 60; | ||||
|     deb_ubuntu1210i386 = makeDeb_i686 (diskImageFuns: diskImageFuns.ubuntu1210i386) 70; | ||||
|     deb_ubuntu1210x86_64 = makeDeb_x86_64 (diskImageFuns: diskImageFuns.ubuntu1210x86_64) 70; | ||||
|     deb_ubuntu1304i386 = makeDeb_i686 (diskImageFuns: diskImageFuns.ubuntu1304i386) 80; | ||||
|     deb_ubuntu1304x86_64 = makeDeb_x86_64 (diskImageFuns: diskImageFuns.ubuntu1304x86_64) 80; | ||||
|     deb_ubuntu1310i386 = makeDeb_i686 (diskImageFuns: diskImageFuns.ubuntu1310i386) 90; | ||||
|     deb_ubuntu1310x86_64 = makeDeb_x86_64 (diskImageFuns: diskImageFuns.ubuntu1310x86_64) 90; | ||||
|     deb_ubuntu1404i386 = makeDeb_i686 (diskImageFuns: diskImageFuns.ubuntu1404i386) 90; | ||||
|     deb_ubuntu1404x86_64 = makeDeb_x86_64 (diskImageFuns: diskImageFuns.ubuntu1404x86_64) 90; | ||||
|     deb_ubuntu1410i386 = makeDeb_i686 (diskImageFuns: diskImageFuns.ubuntu1410i386) 90; | ||||
|     deb_ubuntu1410x86_64 = makeDeb_x86_64 (diskImageFuns: diskImageFuns.ubuntu1410x86_64) 90; | ||||
|     deb_ubuntu1204i386 = makeDeb_i686 (diskImageFuns: diskImageFuns.ubuntu1204i386); | ||||
|     deb_ubuntu1204x86_64 = makeDeb_x86_64 (diskImageFuns: diskImageFuns.ubuntu1204x86_64); | ||||
|     deb_ubuntu1210i386 = makeDeb_i686 (diskImageFuns: diskImageFuns.ubuntu1210i386); | ||||
|     deb_ubuntu1210x86_64 = makeDeb_x86_64 (diskImageFuns: diskImageFuns.ubuntu1210x86_64); | ||||
|     deb_ubuntu1304i386 = makeDeb_i686 (diskImageFuns: diskImageFuns.ubuntu1304i386); | ||||
|     deb_ubuntu1304x86_64 = makeDeb_x86_64 (diskImageFuns: diskImageFuns.ubuntu1304x86_64); | ||||
|     deb_ubuntu1310i386 = makeDeb_i686 (diskImageFuns: diskImageFuns.ubuntu1310i386); | ||||
|     deb_ubuntu1310x86_64 = makeDeb_x86_64 (diskImageFuns: diskImageFuns.ubuntu1310x86_64); | ||||
|     deb_ubuntu1404i386 = makeDeb_i686 (diskImageFuns: diskImageFuns.ubuntu1404i386); | ||||
|     deb_ubuntu1404x86_64 = makeDeb_x86_64 (diskImageFuns: diskImageFuns.ubuntu1404x86_64); | ||||
|     deb_ubuntu1410i386 = makeDeb_i686 (diskImageFuns: diskImageFuns.ubuntu1410i386); | ||||
|     deb_ubuntu1410x86_64 = makeDeb_x86_64 (diskImageFuns: diskImageFuns.ubuntu1410x86_64); | ||||
| 
 | ||||
| 
 | ||||
|     # System tests. | ||||
|  | @ -274,7 +272,7 @@ let | |||
|   makeRPM_x86_64 = makeRPM "x86_64-linux"; | ||||
| 
 | ||||
|   makeRPM = | ||||
|     system: diskImageFun: prio: | ||||
|     system: diskImageFun: | ||||
| 
 | ||||
|     with import <nixpkgs> { inherit system; }; | ||||
| 
 | ||||
|  | @ -284,7 +282,7 @@ let | |||
|       diskImage = (diskImageFun vmTools.diskImageFuns) | ||||
|         { extraPackages = [ "perl-DBD-SQLite" "perl-devel" "sqlite" "sqlite-devel" "bzip2-devel" "emacs" "perl-WWW-Curl" ]; }; | ||||
|       memSize = 1024; | ||||
|       meta.schedulingPriority = prio; | ||||
|       meta.schedulingPriority = 50; | ||||
|       postRPMInstall = "cd /tmp/rpmout/BUILD/nix-* && make installcheck"; | ||||
|     }; | ||||
| 
 | ||||
|  | @ -293,7 +291,7 @@ let | |||
|   makeDeb_x86_64 = makeDeb "x86_64-linux"; | ||||
| 
 | ||||
|   makeDeb = | ||||
|     system: diskImageFun: prio: | ||||
|     system: diskImageFun: | ||||
| 
 | ||||
|     with import <nixpkgs> { inherit system; }; | ||||
| 
 | ||||
|  | @ -303,7 +301,7 @@ let | |||
|       diskImage = (diskImageFun vmTools.diskImageFuns) | ||||
|         { extraPackages = [ "libdbd-sqlite3-perl" "libsqlite3-dev" "libbz2-dev" "libwww-curl-perl" ]; }; | ||||
|       memSize = 1024; | ||||
|       meta.schedulingPriority = prio; | ||||
|       meta.schedulingPriority = 50; | ||||
|       configureFlags = "--sysconfdir=/etc"; | ||||
|       debRequires = [ "curl" "libdbd-sqlite3-perl" "libsqlite3-0" "libbz2-1.0" "bzip2" "xz-utils" "libwww-curl-perl" ]; | ||||
|       debMaintainer = "Eelco Dolstra <eelco.dolstra@logicblox.com>"; | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue