ci: Fix the images specification.
If the current-guix-package parameter is not set, Cuirass will try to update
the in-store Git checkout used by the evaluate.scm inferior:
ice-9/boot-9.scm:1685:16: In procedure raise-exception: ERROR:
1. &inferior-exception: arguments: (git-error #<inferior-object #<<git-error>
code: -3 message: "could not find repository from
'/gnu/store/v33m82qzkvd96dlp2g83dvz62n4pkad2-guix-20d8081'" class: 6>>)
inferior: #<inferior pipe (0 1 1) 7f7948957dc0>
stack: ((#f ("ice-9/boot-9.scm" 1779 13)) (raise-exception ("ice-9/boot-9.scm"
1682 16)) (raise-exception ("ice-9/boot-9.scm" 1684 16)) (#f ("guix/git.scm"
395 13))
This is a follow-up of: 5bce4c8242.
* gnu/ci.scm (image-jobs): Add source and commit arguments.
Use them to set the current-guix-package parameter.
(cuirass-jobs): Adapt accordingly.
			
			
This commit is contained in:
		
							parent
							
								
									a944fd6c4e
								
							
						
					
					
						commit
						5bbb9af5d9
					
				
					 1 changed files with 33 additions and 28 deletions
				
			
		
							
								
								
									
										11
									
								
								gnu/ci.scm
									
										
									
									
									
								
							
							
						
						
									
										11
									
								
								gnu/ci.scm
									
										
									
									
									
								
							| 
						 | 
				
			
			@ -254,11 +254,14 @@ otherwise use the IMAGE name."
 | 
			
		|||
    (parameterize ((%graft? #f))
 | 
			
		||||
      (derivation->job name drv))))
 | 
			
		||||
 | 
			
		||||
(define (image-jobs store system)
 | 
			
		||||
(define* (image-jobs store system
 | 
			
		||||
                     #:key source commit)
 | 
			
		||||
  "Return a list of jobs that build images for SYSTEM."
 | 
			
		||||
  (define MiB
 | 
			
		||||
    (expt 2 20))
 | 
			
		||||
 | 
			
		||||
  (parameterize ((current-guix-package
 | 
			
		||||
                  (channel-source->package source #:commit commit)))
 | 
			
		||||
    (if (member system %guix-system-supported-systems)
 | 
			
		||||
        `(,(image->job store
 | 
			
		||||
                       (image
 | 
			
		||||
| 
						 | 
				
			
			@ -284,7 +287,7 @@ otherwise use the IMAGE name."
 | 
			
		|||
                          #:system system)
 | 
			
		||||
                     %guix-system-images)
 | 
			
		||||
                '()))
 | 
			
		||||
      '()))
 | 
			
		||||
        '())))
 | 
			
		||||
 | 
			
		||||
(define* (system-test-jobs store system
 | 
			
		||||
                           #:key source commit)
 | 
			
		||||
| 
						 | 
				
			
			@ -527,7 +530,9 @@ names."
 | 
			
		|||
                               hello system))))
 | 
			
		||||
         ('images
 | 
			
		||||
          ;; Build Guix System images only.
 | 
			
		||||
          (image-jobs store system))
 | 
			
		||||
          (image-jobs store system
 | 
			
		||||
                      #:source source
 | 
			
		||||
                      #:commit commit))
 | 
			
		||||
         ('system-tests
 | 
			
		||||
          ;; Build Guix System tests only.
 | 
			
		||||
          (system-test-jobs store system
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Reference in a new issue