Merge pull request #250 from ISISComputingGroup/update_build_name

davidkeymer · web-flow · commit 91be9c943e13 · 2025-07-11T14:32:51.000+01:00
Update build name
diff --git a/installation_and_upgrade/Jenkinsfile b/installation_and_upgrade/Jenkinsfile
@@ -11,7 +11,7 @@ pipeline {
   
   triggers {
     pollSCM('H/2 * * * *')
-    upstream(upstreamProjects: 'ibex_gui_pipeline,genie_python_pipeline,EPICS_IOC_Windows7_x64,EPICS_IOC_Windows7_x64_CLEAN', threshold: hudson.model.Result.SUCCESS)
+    upstream(upstreamProjects: 'ibex_gui_pipeline,genie_python_pipeline,EPICS_IOC_Windows_x64,EPICS_IOC_Windows_x64_CLEAN', threshold: hudson.model.Result.SUCCESS)
   }
   
   stages {  
diff --git a/installation_and_upgrade/Jenkinsfile_vhd_creation b/installation_and_upgrade/Jenkinsfile_vhd_creation
@@ -10,7 +10,7 @@ pipeline {
   }
   
   triggers {
-    upstream(upstreamProjects: 'EPICS_IOC_Windows7_x64_CLEAN', threshold: hudson.model.Result.SUCCESS)
+    upstream(upstreamProjects: 'EPICS_IOC_Windows_x64_CLEAN', threshold: hudson.model.Result.SUCCESS)
   }
   
   stages {  
diff --git a/installation_and_upgrade/instrument_install_latest_build_only.bat b/installation_and_upgrade/instrument_install_latest_build_only.bat
@@ -35,7 +35,7 @@ set SERVER_ARCH=x64
 if not "%3" == "" set SERVER_ARCH=%3
 @echo Using server arch %SERVER_ARCH%
 
-set SERVER_WINBUILD=win7
+set SERVER_WINBUILD=win
 if not "%4" == "" set SERVER_WINBUILD=%4
 @echo Using server winbuild %SERVER_WINBUILD%
 

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ pipeline {`
`11`	`11`
`12`	`12`	`triggers {`
`13`	`13`	`pollSCM('H/2 * * * *')`
`14`		`- upstream(upstreamProjects: 'ibex_gui_pipeline,genie_python_pipeline,EPICS_IOC_Windows7_x64,EPICS_IOC_Windows7_x64_CLEAN', threshold: hudson.model.Result.SUCCESS)`
	`14`	`+ upstream(upstreamProjects: 'ibex_gui_pipeline,genie_python_pipeline,EPICS_IOC_Windows_x64,EPICS_IOC_Windows_x64_CLEAN', threshold: hudson.model.Result.SUCCESS)`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`stages {`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ pipeline {`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`triggers {`
`13`		`- upstream(upstreamProjects: 'EPICS_IOC_Windows7_x64_CLEAN', threshold: hudson.model.Result.SUCCESS)`
	`13`	`+ upstream(upstreamProjects: 'EPICS_IOC_Windows_x64_CLEAN', threshold: hudson.model.Result.SUCCESS)`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`stages {`