Propose projects.yaml normalization daily
Add a job that will propose a change (or update a change) to normalize projects.yaml, and run it once daily. Normalization, in this case, chiefly means removing un-used upstream lines from projects.yaml (but will also catch minor YAML errors and line wrapping). Also simplify the proposal node regex. Change-Id: I6520dfcd6f523886aba352f9bd7f9186cfeed84a
This commit is contained in:
parent
dfe8b92214
commit
9fa5fe4c31
|
@ -88,7 +88,7 @@ def set_node_options(item, job, params, default):
|
|||
# Default to single use node. Potentially overriden below.
|
||||
# Select node to run job on.
|
||||
params['OFFLINE_NODE_WHEN_COMPLETE'] = '1'
|
||||
proposal_re = r'^.*(merge-release-tags|(propose|upstream)-(openstack-manuals|requirements|translation)-updates?)$' # noqa
|
||||
proposal_re = r'^.*(merge-release-tags|(propose|upstream)-(.*?)-updates?)$' # noqa
|
||||
pypi_re = r'^.*-(jenkinsci|mavencentral|pypi-(both|wheel))-upload$'
|
||||
python26_re = r'^.*-(py(thon)?)?26.*$'
|
||||
centos6_re = r'^.*-centos6.*$'
|
||||
|
|
|
@ -123,3 +123,17 @@
|
|||
|
||||
publishers:
|
||||
- zuul-swift-upload-console-log
|
||||
|
||||
- job:
|
||||
name: propose-project-config-update
|
||||
node: proposal
|
||||
|
||||
builders:
|
||||
- revoke-sudo
|
||||
- link-logs
|
||||
- net-info
|
||||
- gerrit-git-prep
|
||||
- shell: ./tools/propose_projects_yaml_update.sh
|
||||
|
||||
publishers:
|
||||
- console-log
|
||||
|
|
|
@ -0,0 +1,67 @@
|
|||
#!/bin/bash -xe
|
||||
|
||||
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
||||
# not use this file except in compliance with the License. You may obtain
|
||||
# a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
PROJECT="openstack-infra/project-config"
|
||||
INITIAL_COMMIT_MSG="Normalize projects.yaml"
|
||||
TOPIC="project-yaml-normalization"
|
||||
USERNAME="proposal-bot"
|
||||
ALL_SUCCESS=0
|
||||
|
||||
git config user.name "OpenStack Proposal Bot"
|
||||
git config user.email "openstack-infra@lists.openstack.org"
|
||||
git config gitreview.username "proposal-bot"
|
||||
|
||||
change_id=""
|
||||
# See if there is an open change in the openstack/requirements topic
|
||||
# If so, get the change id for the existing change for use in the
|
||||
# commit msg.
|
||||
change_info=$(ssh -p 29418 $USERNAME@review.openstack.org gerrit query --current-patch-set status:open project:$PROJECT topic:$TOPIC owner:$USERNAME)
|
||||
previous=$(echo "$change_info" | grep "^ number:" | awk '{print $2}')
|
||||
if [ "x${previous}" != "x" ] ; then
|
||||
change_id=$(echo "$change_info" | grep "^change" | awk '{print $2}')
|
||||
# read return a non zero value when it reaches EOF. Because we use a
|
||||
# heredoc here it will always reach EOF and return a nonzero value.
|
||||
# Disable -e temporarily to get around the read.
|
||||
# The reason we use read is to allow for multiline variable content
|
||||
# and variable interpolation. Simply double quoting a string across
|
||||
# multiple lines removes the newlines.
|
||||
set +e
|
||||
read -d '' COMMIT_MSG <<EOF
|
||||
$INITIAL_COMMIT_MSG
|
||||
|
||||
Change-Id: $change_id
|
||||
EOF
|
||||
set -e
|
||||
else
|
||||
COMMIT_MSG=$INITIAL_COMMIT_MSG
|
||||
fi
|
||||
|
||||
git review -s
|
||||
python tools/normalize_projects_yaml.py
|
||||
|
||||
if ! git diff --stat --exit-code HEAD ; then
|
||||
# Commit and review
|
||||
git_args="-a -F-"
|
||||
git commit $git_args <<EOF
|
||||
$COMMIT_MSG
|
||||
EOF
|
||||
# Do error checking manually to ignore one class of failure.
|
||||
set +e
|
||||
OUTPUT=$(git review -t $TOPIC)
|
||||
RET=$?
|
||||
[[ "$RET" -eq "0" || "$OUTPUT" =~ "no new changes" || "$OUTPUT" =~ "no changes made" ]]
|
||||
SUCCESS=$?
|
||||
fi
|
||||
|
||||
exit $SUCCESS
|
|
@ -3533,6 +3533,8 @@ projects:
|
|||
- check-generate-specs-site
|
||||
post:
|
||||
- publish-specs-site
|
||||
periodic:
|
||||
- propose-project-config-update
|
||||
|
||||
- name: openstack-infra/publications
|
||||
template:
|
||||
|
|
|
@ -88,7 +88,7 @@ def set_node_options(item, job, params, default):
|
|||
# Default to single use node. Potentially overriden below.
|
||||
# Select node to run job on.
|
||||
params['OFFLINE_NODE_WHEN_COMPLETE'] = '1'
|
||||
proposal_re = r'^.*(merge-release-tags|(propose|upstream)-(openstack-manuals|requirements|translation)-updates?)$' # noqa
|
||||
proposal_re = r'^.*(merge-release-tags|(propose|upstream)-(.*?)-updates?)$' # noqa
|
||||
pypi_re = r'^.*-(jenkinsci|mavencentral|pypi-(both|wheel))-upload$'
|
||||
python26_re = r'^.*-(py(thon)?)?26.*$'
|
||||
centos6_re = r'^.*-centos6.*$'
|
||||
|
|
Loading…
Reference in New Issue