diff --git a/modules/openstack_project/files/jenkins_job_builder/config/manuals-jobs.yaml b/modules/openstack_project/files/jenkins_job_builder/config/manuals-jobs.yaml index e805d6914a..b2b29ebb99 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/manuals-jobs.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/manuals-jobs.yaml @@ -1,3 +1,17 @@ +- job: + name: propose-openstack-manuals-updates + node: proposal + + builders: + - revoke-sudo + - link-logs + - net-info + - gerrit-git-prep + - shell: /usr/local/jenkins/slave_scripts/propose_update.sh openstack-manuals + + publishers: + - console-log + - job-template: name: 'gate-{name}-tox-doc-publish-{envlist}' diff --git a/modules/openstack_project/files/jenkins_job_builder/config/requirements.yaml b/modules/openstack_project/files/jenkins_job_builder/config/requirements.yaml index ce391b2f52..7a8e498583 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/requirements.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/requirements.yaml @@ -41,7 +41,7 @@ - link-logs - net-info - gerrit-git-prep - - shell: /usr/local/jenkins/slave_scripts/propose_requirements_update.sh + - shell: /usr/local/jenkins/slave_scripts/propose_update.sh requirements publishers: - console-log diff --git a/modules/openstack_project/files/slave_scripts/propose_requirements_update.sh b/modules/openstack_project/files/slave_scripts/propose_update.sh similarity index 87% rename from modules/openstack_project/files/slave_scripts/propose_requirements_update.sh rename to modules/openstack_project/files/slave_scripts/propose_update.sh index bcd0d03238..da7ead50ed 100755 --- a/modules/openstack_project/files/slave_scripts/propose_requirements_update.sh +++ b/modules/openstack_project/files/slave_scripts/propose_update.sh @@ -12,8 +12,18 @@ # License for the specific language governing permissions and limitations # under the License. -INITIAL_COMMIT_MSG="Updated from global requirements" -TOPIC="openstack/requirements" +OWN_PROJECT=$1 +if [ -z "$OWN_PROJECT" ] ; then + echo "usage: $0 project" + exit 1 +fi +if [ "$OWN_PROJECT" == "requirements" ] ; then + INITIAL_COMMIT_MSG="Updated from global requirements" + TOPIC="openstack/requirements" +else + INITIAL_COMMIT_MSG="Updated from openstack-manuals" + TOPIC="openstack/openstack-manuals" +fi USERNAME="proposal-bot" BRANCH=$ZUUL_REF ALL_SUCCESS=0 @@ -80,7 +90,11 @@ EOF continue fi - python update.py $PROJECT_DIR + if [ "$OWN_PROJECT" == "requirements" ] ; then + python update.py $PROJECT_DIR + else + bash -xe tools/sync-projects.sh $PROJECT_DIR + fi pushd $PROJECT_DIR if ! git diff --exit-code HEAD ; then diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml index 7ea3c47600..7ac9de891b 100644 --- a/modules/openstack_project/files/zuul/layout.yaml +++ b/modules/openstack_project/files/zuul/layout.yaml @@ -2570,6 +2570,7 @@ projects: - name: openstack-doc-translation post: - openstack-manuals-tox-doc-publishdocs + - propose-openstack-manuals-updates - name: openstack/operations-guide template: