Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion installation_and_upgrade/Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion installation_and_upgrade/Jenkinsfile_vhd_creation
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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%

Expand Down
Loading