shorter stage name and use latest ubuntu

wolfv · wolfv · commit a27be4e24b2e · 2021-07-01T14:00:37.000+02:00
diff --git a/vinca/generate_azure.py b/vinca/generate_azure.py
@@ -364,7 +364,7 @@ def main():
     print(stages)
 
     # Build Linux pipeline
-    azure_template = {"pool": {"vmImage": "ubuntu-16.04"}}
+    azure_template = {"pool": {"vmImage": "ubuntu-latest"}}
 
     azure_stages = []
 
@@ -378,7 +378,7 @@ def main():
             pkg_jobname = '_'.join([normalize_name(pkg) for pkg in batch])
             stage["jobs"].append(
                 {
-                    "job": pkg_jobname,
+                    "job": f"stage_{i}_job_{len(stage['jobs'])}",
                     "steps": [
                         {
                             "script": azure_linux_script,
diff --git a/vinca/main.py b/vinca/main.py
@@ -145,7 +145,6 @@ def get_depmods(vinca_conf, pkg_name):
                     add_deps[dep_type].append(dict(el))
                 else:
                     add_deps[dep_type].append(el)
-
     return rm_deps, add_deps
 
 

Original file line number	Diff line number	Diff line change
`@@ -364,7 +364,7 @@ def main():`
`364`	`364`	`print(stages)`
`365`	`365`
`366`	`366`	`# Build Linux pipeline`
`367`		`- azure_template = {"pool": {"vmImage": "ubuntu-16.04"}}`
	`367`	`+ azure_template = {"pool": {"vmImage": "ubuntu-latest"}}`
`368`	`368`
`369`	`369`	`azure_stages = []`
`370`	`370`
`@@ -378,7 +378,7 @@ def main():`
`378`	`378`	`pkg_jobname = '_'.join([normalize_name(pkg) for pkg in batch])`
`379`	`379`	`stage["jobs"].append(`
`380`	`380`	`{`
`381`		`- "job": pkg_jobname,`
	`381`	`+ "job": f"stage_{i}_job_{len(stage['jobs'])}",`
`382`	`382`	`"steps": [`
`383`	`383`	`{`
`384`	`384`	`"script": azure_linux_script,`