diff --git a/README.rst b/README.rst index 9ebee9375..746cda0c1 100644 --- a/README.rst +++ b/README.rst @@ -75,7 +75,7 @@ Then install the required python packages using pip_:: $ sudo pip install PyYAML python-jenkins -.. _Jenkins: http://jenkins-ci.org/ +.. _Jenkins: https://jenkins.io/ .. _YAML: http://www.yaml.org/ .. _JSON: http://json.org/ .. _pep8: https://pypi.python.org/pypi/pep8 diff --git a/jenkins_jobs/modules/builders.py b/jenkins_jobs/modules/builders.py index 3f3eaad08..63e37d10b 100644 --- a/jenkins_jobs/modules/builders.py +++ b/jenkins_jobs/modules/builders.py @@ -2322,7 +2322,10 @@ def sonar(parser, xml_parent, data): """yaml: sonar Invoke standalone Sonar analysis. Requires the Jenkins `Sonar Plugin. - `_ + `_ :arg str sonar-name: Name of the Sonar installation. :arg str task: Task to run. (optional) diff --git a/jenkins_jobs/modules/publishers.py b/jenkins_jobs/modules/publishers.py index 1990e2cd0..b2bfc8584 100644 --- a/jenkins_jobs/modules/publishers.py +++ b/jenkins_jobs/modules/publishers.py @@ -1047,7 +1047,7 @@ def cucumber_reports(parser, xml_parent, data): :arg str file-include-pattern: include pattern (default '') :arg str file-exclude-pattern: exclude pattern (default '') :arg str plugin-url-path: The path to the jenkins user content url - e.g. http://host:port[/jenkins/]plugin - leave empty if jenkins + e.g. :samp:`http://host:port[/jenkins/]plugin` - leave empty if jenkins url root is host:port (default '') :arg bool skipped-fails: skipped steps to cause the build to fail (default false) @@ -2269,7 +2269,8 @@ def sonar(parser, xml_parent, data): """yaml: sonar Sonar plugin support. Requires the Jenkins `Sonar Plugin. - `_ + `_ :arg str jdk: JDK to use (inherited from the job if omitted). (optional) :arg str branch: branch onto which the analysis will be posted (optional) @@ -5714,7 +5715,7 @@ def phabricator(parser, xml_parent, data): Integrate with `Phabricator `_ Requires the Jenkins :jenkins-wiki:`Phabricator Plugin - `. + `. :arg bool comment-on-success: Post a *comment* when the build succeeds. (optional) diff --git a/jenkins_jobs/modules/scm.py b/jenkins_jobs/modules/scm.py index ddabf244a..573d1c815 100644 --- a/jenkins_jobs/modules/scm.py +++ b/jenkins_jobs/modules/scm.py @@ -116,9 +116,9 @@ def git(parser, xml_parent, data): :browsers supported: * **auto** - (default) - * **assemblaweb** - https://www.assembla.com/ - * **bitbucketweb** - https://www.bitbucket.org/ - * **cgit** - http://git.zx2c4.com/cgit/about/ + * **assemblaweb** - https://www.assembla.com/home + * **bitbucketweb** - https://bitbucket.org/ + * **cgit** - https://git.zx2c4.com/cgit/about/ * **fisheye** - https://www.atlassian.com/software/fisheye * **gitblit** - http://gitblit.com/ * **githubweb** - https://github.com/ @@ -126,13 +126,13 @@ def git(parser, xml_parent, data): * **gitlab** - https://about.gitlab.com/ * **gitlist** - http://gitlist.org/ * **gitoriousweb** - https://gitorious.org/ - * **gitweb** - http://git-scm.com/docs/gitweb + * **gitweb** - https://git-scm.com/docs/gitweb * **kiln** - https://www.fogcreek.com/kiln/ * **microsoft\-tfs\-2013** - |tfs_2013| * **phabricator** - http://phabricator.org/ * **redmineweb** - http://www.redmine.org/ * **rhodecode** - https://rhodecode.com/ - * **stash** - https://www.atlassian.com/software/stash + * **stash** - https://www.atlassian.com/software/bitbucket/server * **viewgit** - http://viewgit.fealdia.org/ :arg str browser-url: url for the repository browser (required if browser is not 'auto', no default) @@ -994,7 +994,7 @@ def hg(self, xml_parent, data): :browsers supported: * **auto** - (default) - * **bitbucketweb** - https://www.bitbucket.org/ + * **bitbucketweb** - https://bitbucket.org/ * **fisheye** - https://www.atlassian.com/software/fisheye * **googlecode** - https://code.google.com/ * **hgweb** - https://www.selenic.com/hg/help/hgweb diff --git a/jenkins_jobs/modules/triggers.py b/jenkins_jobs/modules/triggers.py index fa5f991c6..e8d27ba63 100644 --- a/jenkins_jobs/modules/triggers.py +++ b/jenkins_jobs/modules/triggers.py @@ -1244,7 +1244,7 @@ def monitor_folders(parser, xml_parent, data): """yaml: monitor-folders Configure Jenkins to monitor folders. Requires the Jenkins :jenkins-wiki:`Filesystem Trigger Plugin - `. + `. :arg str path: Folder path to poll. (optional) :arg list includes: Fileset includes setting that specifies the list of @@ -1287,7 +1287,7 @@ def monitor_files(parser, xml_parent, data): """yaml: monitor-files Configure Jenkins to monitor files. Requires the Jenkins :jenkins-wiki:`Filesystem Trigger Plugin - `. + `. :arg list files: List of files to monitor diff --git a/jenkins_jobs/modules/wrappers.py b/jenkins_jobs/modules/wrappers.py index ada8b07a2..80aff8e9c 100644 --- a/jenkins_jobs/modules/wrappers.py +++ b/jenkins_jobs/modules/wrappers.py @@ -498,10 +498,10 @@ def rbenv(parser, xml_parent, data): (default: 'bundler,rake') :arg str rbenv-root: RBENV_ROOT (default: $HOME/.rbenv) :arg str rbenv-repo: Which repo to clone rbenv from - (default: https://github.com/sstephenson/rbenv.git) + (default: https://github.com/rbenv/rbenv) :arg str rbenv-branch: Which branch to clone rbenv from (default: master) :arg str ruby-build-repo: Which repo to clone ruby-build from - (default: https://github.com/sstephenson/ruby-build.git) + (default: https://github.com/rbenv/ruby-build) :arg str ruby-build-branch: Which branch to clone ruby-build from (default: master) @@ -515,10 +515,10 @@ def rbenv(parser, xml_parent, data): ("preinstall-gem-list", 'gem__list', 'bundler,rake'), ("rbenv-root", 'rbenv__root', '$HOME/.rbenv'), ("rbenv-repo", 'rbenv__repository', - 'https://github.com/sstephenson/rbenv.git'), + 'https://github.com/rbenv/rbenv'), ("rbenv-branch", 'rbenv__revision', 'master'), ("ruby-build-repo", 'ruby__build__repository', - 'https://github.com/sstephenson/ruby-build.git'), + 'https://github.com/rbenv/ruby-build'), ("ruby-build-branch", 'ruby__build__revision', 'master'), ("ruby-version", 'version', '1.9.3-p484'), ] @@ -1708,7 +1708,7 @@ def artifactory_maven(parser, xml_parent, data): :jenkins-wiki:`Artifactory Plugin ` :arg str url: URL of the Artifactory server. e.g. - http://www.jfrog.com/artifactory/ (default '') + https://www.jfrog.com/artifactory/ (default '') :arg str name: Artifactory user with permissions use for connected to the selected Artifactory Server (default '') @@ -1753,7 +1753,7 @@ def artifactory_generic(parser, xml_parent, data): :jenkins-wiki:`Artifactory Plugin ` :arg str url: URL of the Artifactory server. e.g. - http://www.jfrog.com/artifactory/ (default: '') + https://www.jfrog.com/artifactory/ (default: '') :arg str name: Artifactory user with permissions use for connected to the selected Artifactory Server (default '') @@ -1830,7 +1830,7 @@ def artifactory_maven_freestyle(parser, xml_parent, data): Requires :jenkins-wiki:`Artifactory Plugin ` :arg str url: URL of the Artifactory server. e.g. - http://www.jfrog.com/artifactory/ (default: '') + https://www.jfrog.com/artifactory/ (default: '') :arg str name: Artifactory user with permissions use for connected to the selected Artifactory Server (default '') :arg str release-repo-key: Release repository name (default '') diff --git a/tests/wrappers/fixtures/rbenv001.xml b/tests/wrappers/fixtures/rbenv001.xml index 0d6c990cc..7d2618df7 100644 --- a/tests/wrappers/fixtures/rbenv001.xml +++ b/tests/wrappers/fixtures/rbenv001.xml @@ -7,9 +7,9 @@ bundler,rake $HOME/.rbenv - https://github.com/sstephenson/rbenv.git + https://github.com/rbenv/rbenv master - https://github.com/sstephenson/ruby-build.git + https://github.com/rbenv/ruby-build master 1.9.3-p484 diff --git a/tests/wrappers/fixtures/rbenv002.xml b/tests/wrappers/fixtures/rbenv002.xml index d250abea2..d4001da34 100644 --- a/tests/wrappers/fixtures/rbenv002.xml +++ b/tests/wrappers/fixtures/rbenv002.xml @@ -7,9 +7,9 @@ bundler,rake $HOME/.rbenv - https://github.com/sstephenson/rbenv.git + https://github.com/rbenv/rbenv master - https://github.com/sstephenson/ruby-build.git + https://github.com/rbenv/ruby-build master 2.0.0-p353