This reverts commit a43156a861.
			
			
This commit is contained in:
		@@ -1253,7 +1253,6 @@ def main_script_replacements(cmd):
 | 
				
			|||||||
                op=lambda cmd: cmd.replace("mirror_prefix", temp_storage_url_prefix),
 | 
					                op=lambda cmd: cmd.replace("mirror_prefix", temp_storage_url_prefix),
 | 
				
			||||||
            )
 | 
					            )
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            cleanup_job["dependencies"] = []
 | 
					 | 
				
			||||||
            output_object["cleanup"] = cleanup_job
 | 
					            output_object["cleanup"] = cleanup_job
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        if (
 | 
					        if (
 | 
				
			||||||
@@ -1277,7 +1276,6 @@ def main_script_replacements(cmd):
 | 
				
			|||||||
                if buildcache_destination
 | 
					                if buildcache_destination
 | 
				
			||||||
                else remote_mirror_override or remote_mirror_url
 | 
					                else remote_mirror_override or remote_mirror_url
 | 
				
			||||||
            )
 | 
					            )
 | 
				
			||||||
            signing_job["dependencies"] = []
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
            output_object["sign-pkgs"] = signing_job
 | 
					            output_object["sign-pkgs"] = signing_job
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -1298,7 +1296,6 @@ def main_script_replacements(cmd):
 | 
				
			|||||||
            final_job["when"] = "always"
 | 
					            final_job["when"] = "always"
 | 
				
			||||||
            final_job["retry"] = service_job_retries
 | 
					            final_job["retry"] = service_job_retries
 | 
				
			||||||
            final_job["interruptible"] = True
 | 
					            final_job["interruptible"] = True
 | 
				
			||||||
            final_job["dependencies"] = []
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
            output_object["rebuild-index"] = final_job
 | 
					            output_object["rebuild-index"] = final_job
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -73,7 +73,6 @@ default:
 | 
				
			|||||||
# Job templates
 | 
					# Job templates
 | 
				
			||||||
########################################
 | 
					########################################
 | 
				
			||||||
.base-job:
 | 
					.base-job:
 | 
				
			||||||
  when: manual
 | 
					 | 
				
			||||||
  variables:
 | 
					  variables:
 | 
				
			||||||
    PIPELINE_MIRROR_TEMPLATE: "single-src-protected-mirrors.yaml.in"
 | 
					    PIPELINE_MIRROR_TEMPLATE: "single-src-protected-mirrors.yaml.in"
 | 
				
			||||||
    # TODO: We can remove this when we drop the "deprecated" stack
 | 
					    # TODO: We can remove this when we drop the "deprecated" stack
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user