Update jenkins url with new job name

dianakhuang · Oct 4, 2013 · cab3f61 · cab3f61
1 parent 70c9e93
commit cab3f61
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 12 deletions.
diff --git a/.ruby-version b/.ruby-version
@@ -0,0 +1 @@
+1.9.3-p392
diff --git a/jobs/edx-violations.rb b/jobs/edx-violations.rb
@@ -3,11 +3,12 @@
 require "nokogiri"
 
 JENKINS_BASE_URL = 'https://jenkins.testeng.edx.org'
-
+JENKINS_JOB_NAME = 'edx-all-tests-auto-master'
+JENKINS_JOB_URL = JENKINS_BASE_URL + '/job/' + JENKINS_JOB_NAME
 
 SCHEDULER.every '1m', :first_in => 0 do |job|
 
-    violations_uri = JENKINS_BASE_URL + '/job/edx-platform-master/SHARD=1,TEST_SUITE=quality/violations/?'
+    violations_uri = JENKINS_JOB_URL + '/SHARD=1,TEST_SUITE=quality/violations/?'
 
     violations_data = open(violations_uri, :ssl_verify_mode=>OpenSSL::SSL::VERIFY_NONE).read
 

diff --git a/jobs/edx_jenkins.rb b/jobs/edx_jenkins.rb
@@ -2,13 +2,14 @@
 require 'openssl'
 require 'json'
 
-JENKINS_BASE_URL = 'https://jenkins.testeng.edx.org'
+JENKINS_JOB_NAME = 'edx-all-tests-auto-master'
+JENKINS_JOB_URL = JENKINS_BASE_URL + '/job/' + JENKINS_JOB_NAME
 
 current_status = nil
 SCHEDULER.every '10s', :first_in => 0 do
     last_status = current_status
 
-    build_uri = JENKINS_BASE_URL + "/job/edx-platform-master/lastBuild/api/json"
+    build_uri = JENKINS_JOB_URL + "/lastBuild/api/json"
 
     # Once SSL certificates are set up correctly, we can remove the :ssl_verify_mode option
     data = open(build_uri, :ssl_verify_mode=>OpenSSL::SSL::VERIFY_NONE).read

diff --git a/jobs/js_coverage.rb b/jobs/js_coverage.rb
@@ -3,19 +3,21 @@
 require 'json'
 
 JENKINS_BASE_URL = 'https://jenkins.testeng.edx.org'
+JENKINS_JOB_NAME = 'edx-all-tests-auto-master'
+JENKINS_JOB_URL = JENKINS_BASE_URL + '/job/' + JENKINS_JOB_NAME
 
 # :first_in sets how long it takes before the job is first run. In this case, it is run immediately
 SCHEDULER.every '5m', :first_in => 0 do |job|
 
     # Retrieve the number of the last stable build
-    last_build_uri = JENKINS_BASE_URL + '/job/edx-platform-master/lastStableBuild/buildNumber'
+    last_build_uri = JENKINS_JOB_URL + '/lastStableBuild/buildNumber'
 
     # Once SSL certificates are set up correctly, we can remove the :ssl_verify_mode option
     response = open(last_build_uri, :ssl_verify_mode=>OpenSSL::SSL::VERIFY_NONE).read
     last_build_num = response.to_i
 
     # Retrieve the coverage info as JSON
-    coverage_uri = JENKINS_BASE_URL + "/job/edx-platform-master/SHARD=1,TEST_SUITE=unit/#{last_build_num}/cobertura/javascript/api/json?depth=2"
+    coverage_uri = JENKINS_JOB_URL + "/SHARD=1,TEST_SUITE=unit/#{last_build_num}/cobertura/javascript/api/json?depth=2"
     coverage_data = open(coverage_uri, :ssl_verify_mode=>OpenSSL::SSL::VERIFY_NONE).read
 
     # Parse the JSON

diff --git a/jobs/mitx_hash.rb b/jobs/mitx_hash.rb
@@ -16,8 +16,8 @@
            ]
 s_hosts = ["stage-edge-edxapp-001",
            "stage-edge-edxapp-002",
-           "stage-edxapp-001",
-           "stage-edxapp-002"
+           "stage-edxapp-002",
+           "stage-edxapp-004"
            ]
 
 suffix = '.m.edx.org'

diff --git a/jobs/python_coverage.rb b/jobs/python_coverage.rb
@@ -4,21 +4,21 @@
 
 
 JENKINS_BASE_URL = 'https://jenkins.testeng.edx.org'
-
-uri_base = '/view/Code/job/edx-deploy-branch-tests/coveragepy/reports/'
+JENKINS_JOB_NAME = 'edx-all-tests-auto-master'
+JENKINS_JOB_URL = JENKINS_BASE_URL + '/job/' + JENKINS_JOB_NAME
 
 # :first_in sets how long it takes before the job is first run. In this case, it is run immediately
 SCHEDULER.every '5m', :first_in => 0 do |job|
 
     # Retrieve the number of the last stable build
-    last_build_uri = JENKINS_BASE_URL + '/job/edx-platform-master/lastStableBuild/buildNumber'
+    last_build_uri = JENKINS_JOB_URL + '/lastStableBuild/buildNumber'
 
     # Once SSL certificates are set up correctly, we can remove the :ssl_verify_mode option
     response = open(last_build_uri, :ssl_verify_mode=>OpenSSL::SSL::VERIFY_NONE).read
     last_build_num = response.to_i
 
     # Retrieve all Python coverage info for the last successful job
-    coverage_uri = JENKINS_BASE_URL + "/job/edx-platform-master/SHARD=1,TEST_SUITE=unit/#{last_build_num}/cobertura/_default_/api/json?depth=3"
+    coverage_uri = JENKINS_JOB_URL + "/SHARD=1,TEST_SUITE=unit/#{last_build_num}/cobertura/_default_/api/json?depth=3"
     coverage_data = open(coverage_uri, :ssl_verify_mode=>OpenSSL::SSL::VERIFY_NONE).read
 
     # Parse the JSON