From ac641f64c4daf9f611dacb46e2f930da62837d0e Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 24 Mar 2017 16:52:08 +0800 Subject: [PATCH] =?UTF-8?q?jenkins=E5=9C=B0=E5=9D=80=E5=86=99=E5=85=A5?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/challenges_controller.rb | 4 ++-- app/controllers/games_controller.rb | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/controllers/challenges_controller.rb b/app/controllers/challenges_controller.rb index efe857afb..d3b236a01 100644 --- a/app/controllers/challenges_controller.rb +++ b/app/controllers/challenges_controller.rb @@ -148,10 +148,10 @@ class ChallengesController < ApplicationController taskId = params[:id] jobName = @shixun.forked_form step = @challenge.position - + jenkins_shixuns = Redmine::Configuration['jenkins_shixuns'] if @challenge.status == 0 params = {:jobName => "#{jobName}", :taskId => "#{taskId}", :step => "#{step}", :gitUrl => "#{gitUrl}"} - uri = URI.parse("http://123.59.135.74:9999/jenkins-exec/api/buildJob") + uri = URI("#{jenkins_shixuns}/jenkins-exec/api/buildJob") res = uri_exec uri, params # @challenge.update_attribute(:status, 1) end diff --git a/app/controllers/games_controller.rb b/app/controllers/games_controller.rb index b9faa41e9..6dc7853fc 100644 --- a/app/controllers/games_controller.rb +++ b/app/controllers/games_controller.rb @@ -99,9 +99,10 @@ class GamesController < ApplicationController end end + jenkins_shixuns = Redmine::Configuration['jenkins_shixuns'] step = @game.stage params = {:jobName => "#{jobName}", :taskId => "#{taskId}", :step => "#{step}", :gitUrl => "#{gitUrl}", :testCode => "#{testCode}"} - uri = URI.parse("http://123.59.135.74:9999/jenkins-exec/api/buildJob") + uri = URI("#{jenkins_shixuns}/jenkins-exec/api/buildJob") res = uri_exec uri, params render :json => {data:"success"}