Merge pull request #10 from wcm-io-devops/feature/remove-pkg-and-repo…

…-options Remove pkg and repo urls since they are not distribution sensitive.
wcm-io-devops · May 14, 2019 · 45718d8 · 45718d8
2 parents b1db991 + 7e45baa
commit 45718d8
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 22 deletions.
diff --git a/README.md b/README.md
@@ -50,16 +50,6 @@ Linux jenkins user.
 
 Linux group of jenkins user.
 
-    jenkins_pipeline_library_jenkins_pkg_url: https://pkg.jenkins.io/debian-stable/binary
-
-Package url for installing specific stable jenkins versions.
-
-    jenkins_pipeline_library_jenkins_repo_url: deb http://pkg.jenkins-ci.org/debian-stable binary/
-
-Repo url for installing stable jenkins versions.
-
-    jenkins_pipeline_library_jenkins_repo_key_url: http://pkg.jenkins-ci.org/debian-stable/jenkins-ci.org.key
-
 URL for the repo key.
 
     jenkins_pipeline_library_admin_username: admin

diff --git a/defaults/main.yaml b/defaults/main.yaml
@@ -10,15 +10,6 @@ jenkins_pipeline_library_jenkins_process_user: jenkins
 # Linux group of jenkins user
 jenkins_pipeline_library_jenkins_process_group: "{{ jenkins_pipeline_library_jenkins_process_user }}"
 
-# Package url for installing specific stable jenkins versions
-jenkins_pipeline_library_jenkins_pkg_url: https://pkg.jenkins.io/debian-stable/binary
-
-# Repo url for installing stable jenkins versions
-jenkins_pipeline_library_jenkins_repo_url: deb http://pkg.jenkins-ci.org/debian-stable binary/
-
-# URL for the repo key
-jenkins_pipeline_library_jenkins_repo_key_url: http://pkg.jenkins-ci.org/debian-stable/jenkins-ci.org.key
-
 # Jenkins admin username
 jenkins_pipeline_library_admin_username: admin
 

diff --git a/meta/main.yml b/meta/main.yml
@@ -27,9 +27,6 @@ dependencies:
       jenkins_home: "{{ jenkins_pipeline_library_jenkins_home }}",
       jenkins_hostname: "{{ jenkins_pipeline_library_jenkins_hostname }}",
       jenkins_version: "{{ jenkins_pipeline_library_jenkins_version }}",
-      jenkins_repo_url: "{{ jenkins_pipeline_library_jenkins_repo_url }}",
-      jenkins_repo_key_url: "{{ jenkins_pipeline_library_jenkins_repo_key_url }}",
-      jenkins_pkg_url: "{{ jenkins_pipeline_library_jenkins_pkg_url }}",
       jenkins_process_user: "{{ jenkins_pipeline_library_jenkins_process_user }}",
       jenkins_process_group: "{{ jenkins_pipeline_library_jenkins_process_group }}",
       tags: ['wcm_io_devops.jenkins_pipeline_library.jenkins-installation'],