gitlab-ci: only run the reliable emulators on merge requests
This commit is contained in:
		
							parent
							
								
									683a990da8
								
							
						
					
					
						commit
						b632066ca7
					
				@ -107,9 +107,9 @@ connected 22 default armeabi-v7a:
 | 
				
			|||||||
  tags:
 | 
					  tags:
 | 
				
			||||||
    - fdroid
 | 
					    - fdroid
 | 
				
			||||||
    - kvm
 | 
					    - kvm
 | 
				
			||||||
 | 
					  allow_failure: true
 | 
				
			||||||
  only:
 | 
					  only:
 | 
				
			||||||
    - merge_requests
 | 
					    - branches@eighthave/fdroidclient
 | 
				
			||||||
    - branches@fdroid/fdroidclient
 | 
					 | 
				
			||||||
  <<: *test-template
 | 
					  <<: *test-template
 | 
				
			||||||
  <<: *connected-template
 | 
					  <<: *connected-template
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -118,27 +118,21 @@ connected 17 default x86:
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
connected 18 default x86:
 | 
					connected 18 default x86:
 | 
				
			||||||
  <<: *kvm-template
 | 
					  <<: *kvm-template
 | 
				
			||||||
  only:
 | 
					 | 
				
			||||||
    - master@fdroid/fdroidclient
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
connected 23 default x86:
 | 
					connected 23 default x86:
 | 
				
			||||||
  <<: *kvm-template
 | 
					  <<: *kvm-template
 | 
				
			||||||
  allow_failure: true
 | 
					 | 
				
			||||||
  only:
 | 
					 | 
				
			||||||
    - master@fdroid/fdroidclient
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
connected 25 default x86:
 | 
					connected 25 default x86:
 | 
				
			||||||
  <<: *kvm-template
 | 
					  <<: *kvm-template
 | 
				
			||||||
 | 
					  allow_failure: false
 | 
				
			||||||
 | 
					  only:
 | 
				
			||||||
 | 
					    - merge_requests
 | 
				
			||||||
 | 
					
 | 
				
			||||||
connected 26 google_apis x86:
 | 
					connected 26 google_apis x86:
 | 
				
			||||||
  <<: *kvm-template
 | 
					  <<: *kvm-template
 | 
				
			||||||
  only:
 | 
					 | 
				
			||||||
    - master@fdroid/fdroidclient
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
connected 27 google_apis_playstore x86:
 | 
					connected 27 google_apis_playstore x86:
 | 
				
			||||||
  <<: *kvm-template
 | 
					  <<: *kvm-template
 | 
				
			||||||
  only:
 | 
					 | 
				
			||||||
    - master@fdroid/fdroidclient
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
connected 28 default x86_64:
 | 
					connected 28 default x86_64:
 | 
				
			||||||
  <<: *kvm-template
 | 
					  <<: *kvm-template
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user