From 338003fd77fc9fb4a3fa79573e04c3c6f2f383dd Mon Sep 17 00:00:00 2001 From: daisy-ycguo Date: Thu, 13 Jun 2013 10:07:17 +0800 Subject: [PATCH] Fixed two errors of document translation jobs Added package gnome-doc-utils to standard packages which is required by the slicing script for document translation. Fixed an error in manuals-propose-translation-update job definition. bug 1187253 Change-Id: Ib8c3e950de29f6afbbfad6a1b31bc3cf7c48a52f Reviewed-on: https://review.openstack.org/32824 Reviewed-by: Khai Do Reviewed-by: James E. Blair Approved: Clark Boylan Reviewed-by: Clark Boylan Tested-by: Jenkins --- modules/jenkins/manifests/params.pp | 4 ++++ modules/jenkins/manifests/slave.pp | 1 + .../files/jenkins_job_builder/config/translation-jobs.yaml | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/jenkins/manifests/params.pp b/modules/jenkins/manifests/params.pp index 20822f792c..ef4d408d5a 100644 --- a/modules/jenkins/manifests/params.pp +++ b/modules/jenkins/manifests/params.pp @@ -20,6 +20,8 @@ class jenkins::params { $mod_wsgi_package = 'mod_wsgi' $libcurl_dev_package = 'libcurl-devel' $ldap_dev_package = 'openldap-devel' + # packages needed by document translation + $gnome_doc_package = 'gnome-doc-utils' # for keystone ldap auth integration $libsasl_dev = 'cyrus-sasl-devel' $mysql_dev_package = 'mysql-devel' @@ -62,6 +64,8 @@ class jenkins::params { $mod_wsgi_package = 'libapache2-mod-wsgi' $libcurl_dev_package = 'libcurl4-gnutls-dev' $ldap_dev_package = 'libldap2-dev' + # packages needed by document translation + $gnome_doc_package = 'gnome-doc-utils' # for keystone ldap auth integration $libsasl_dev = 'libsasl2-dev' $mysql_dev_package = 'libmysqlclient-dev' diff --git a/modules/jenkins/manifests/slave.pp b/modules/jenkins/manifests/slave.pp index 26f1b4c373..f1e221e0f4 100644 --- a/modules/jenkins/manifests/slave.pp +++ b/modules/jenkins/manifests/slave.pp @@ -32,6 +32,7 @@ class jenkins::slave( $::jenkins::params::docbook_xml_package, # for building openstack docs $::jenkins::params::docbook5_xml_package, # for building openstack docs $::jenkins::params::docbook5_xsl_package, # for building openstack docs + $::jenkins::params::gnome_doc_package, # for generating translation files for docs $::jenkins::params::firefox_package, # for selenium tests $::jenkins::params::mod_wsgi_package, $::jenkins::params::libcurl_dev_package, diff --git a/modules/openstack_project/files/jenkins_job_builder/config/translation-jobs.yaml b/modules/openstack_project/files/jenkins_job_builder/config/translation-jobs.yaml index 43cc830244..b856b6c4f5 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/translation-jobs.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/translation-jobs.yaml @@ -68,7 +68,7 @@ scm: - git: - url: 'git://github.com/{github-org}/openstack-manuals.git' + url: 'git://github.com/openstack/openstack-manuals.git' branches: - 'origin/master'