Stop running compare-xml jobs
This removes the compare-xml jobs from both the project-config and the jenkins-job-builder projects. The JJB configuration in project-config is beginning to include custom JJB components which are supported only in Zuul v2.5. For the project-config directory, we install a custom JJB module to support these extensions and run JJB to validate that we have a good configuration. It would be possible to do the same for changes to JJB, but considering that we are beginning to use custom components while pinning to a released version of JJB (rather than master), it seems like the project-config corpus of jobs may be less relevant now, so perhaps now is a good time to stop. Change-Id: I7c96b866663ce497b566a20f55c4c715b13c3723
This commit is contained in:
parent
a9c6b6f020
commit
4bf14ffdf5
@ -1,17 +1,3 @@
|
|||||||
- job:
|
|
||||||
name: gate-project-config-compare-xml
|
|
||||||
node: ubuntu-xenial
|
|
||||||
|
|
||||||
builders:
|
|
||||||
- net-info
|
|
||||||
- gerrit-git-prep
|
|
||||||
- install-distro-packages
|
|
||||||
- revoke-sudo
|
|
||||||
- shell: ./tools/run-compare-xml.sh
|
|
||||||
|
|
||||||
publishers:
|
|
||||||
- console-log
|
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: gate-project-config-gerrit
|
name: gate-project-config-gerrit
|
||||||
node: ubuntu-xenial
|
node: ubuntu-xenial
|
||||||
|
@ -1,13 +0,0 @@
|
|||||||
- job:
|
|
||||||
name: jenkins-job-builder-compare-xml
|
|
||||||
node: ubuntu-trusty
|
|
||||||
|
|
||||||
builders:
|
|
||||||
- gerrit-git-prep
|
|
||||||
- install-distro-packages
|
|
||||||
- revoke-sudo
|
|
||||||
- shell: |
|
|
||||||
./tools/run-compare-xml.sh
|
|
||||||
|
|
||||||
publishers:
|
|
||||||
- console-log
|
|
@ -1,61 +0,0 @@
|
|||||||
#!/bin/bash -e
|
|
||||||
|
|
||||||
# Copyright (c) 2012, AT&T Labs, Yun Mao <yunmao@gmail.com>
|
|
||||||
# All Rights Reserved.
|
|
||||||
# Copyright 2012 Hewlett-Packard Development Company, L.P.
|
|
||||||
#
|
|
||||||
# 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.
|
|
||||||
|
|
||||||
rm -fr .test
|
|
||||||
mkdir .test
|
|
||||||
cd .test
|
|
||||||
/usr/zuul-env/bin/zuul-cloner -m ../tools/run-compare-clonemap.yaml --cache-dir /opt/git git://git.openstack.org openstack-infra/jenkins-job-builder
|
|
||||||
cd jenkins-job-builder
|
|
||||||
# These are $WORKSPACE/.test/jenkins-job-builder/.test/...
|
|
||||||
mkdir -p .test/old/config
|
|
||||||
mkdir -p .test/old/out
|
|
||||||
mkdir -p .test/new/config
|
|
||||||
mkdir -p .test/new/out
|
|
||||||
cd ../..
|
|
||||||
|
|
||||||
GITHEAD=$(git rev-parse HEAD)
|
|
||||||
|
|
||||||
# First generate output from HEAD~1
|
|
||||||
git checkout HEAD~1
|
|
||||||
cp jenkins/jobs/* .test/jenkins-job-builder/.test/old/config
|
|
||||||
|
|
||||||
# Then use that as a reference to compare against HEAD
|
|
||||||
git checkout $GITHEAD
|
|
||||||
cp jenkins/jobs/* .test/jenkins-job-builder/.test/new/config
|
|
||||||
|
|
||||||
cd .test/jenkins-job-builder
|
|
||||||
|
|
||||||
tox -e compare-xml-old
|
|
||||||
tox -e compare-xml-new
|
|
||||||
|
|
||||||
set +e
|
|
||||||
diff -r -N -u .test/old/out .test/new/out
|
|
||||||
CHANGED=$? # 0 == same ; 1 == different ; 2 == error
|
|
||||||
|
|
||||||
echo "======================="
|
|
||||||
echo "Number of changed jobs:"
|
|
||||||
diff -r -N -u .test/old/out .test/new/out |grep -c '^diff -r'
|
|
||||||
echo "======================="
|
|
||||||
set -e
|
|
||||||
|
|
||||||
echo
|
|
||||||
echo "You are in detached HEAD mode. If you are a developer"
|
|
||||||
echo "and not very familiar with git, you might want to do"
|
|
||||||
echo "'git checkout branch-name' to go back to your branch."
|
|
||||||
|
|
||||||
exit $CHANGED
|
|
@ -2267,11 +2267,6 @@ jobs:
|
|||||||
- name: dev-zuul-coverage
|
- name: dev-zuul-coverage
|
||||||
voting: false
|
voting: false
|
||||||
|
|
||||||
- name: jenkins-job-builder-compare-xml
|
|
||||||
voting: false
|
|
||||||
failure-message: WARNING XML output has changed.
|
|
||||||
success-message: XML output is unchanged.
|
|
||||||
|
|
||||||
- name: ^gate-jenkins-job-builder-tox-docs-linkcheck-ubuntu-(trusty|xenial)$
|
- name: ^gate-jenkins-job-builder-tox-docs-linkcheck-ubuntu-(trusty|xenial)$
|
||||||
voting: false
|
voting: false
|
||||||
failure-message: WARNING broken links in docs
|
failure-message: WARNING broken links in docs
|
||||||
@ -2291,17 +2286,6 @@ jobs:
|
|||||||
- name: gate-bashate-devstack
|
- name: gate-bashate-devstack
|
||||||
voting: false
|
voting: false
|
||||||
|
|
||||||
- name: gate-project-config-compare-xml
|
|
||||||
voting: false
|
|
||||||
failure-message: Jenkins XML output has changed.
|
|
||||||
success-message: Jenkins XML output is unchanged.
|
|
||||||
files:
|
|
||||||
- 'bindep.txt'
|
|
||||||
- 'jenkins/jobs/.*'
|
|
||||||
- 'other-requirements.txt'
|
|
||||||
- 'tools/run-compare-clonemap.yaml'
|
|
||||||
- 'tools/run-compare-xml.sh'
|
|
||||||
|
|
||||||
- name: gate-project-config-irc-access
|
- name: gate-project-config-irc-access
|
||||||
files:
|
files:
|
||||||
- 'bindep.txt'
|
- 'bindep.txt'
|
||||||
@ -3949,7 +3933,6 @@ projects:
|
|||||||
- name: publish-to-pypi
|
- name: publish-to-pypi
|
||||||
- name: infra-publish-jobs
|
- name: infra-publish-jobs
|
||||||
check:
|
check:
|
||||||
- jenkins-job-builder-compare-xml
|
|
||||||
- jenkins-job-builder-coverage-ubuntu-trusty
|
- jenkins-job-builder-coverage-ubuntu-trusty
|
||||||
- jenkins-job-builder-coverage-ubuntu-xenial
|
- jenkins-job-builder-coverage-ubuntu-xenial
|
||||||
- gate-jenkins-job-builder-tox-docs-linkcheck-ubuntu-trusty
|
- gate-jenkins-job-builder-tox-docs-linkcheck-ubuntu-trusty
|
||||||
@ -4091,7 +4074,6 @@ projects:
|
|||||||
- name: bindep-fallback
|
- name: bindep-fallback
|
||||||
- name: merge-check
|
- name: merge-check
|
||||||
check:
|
check:
|
||||||
- gate-project-config-compare-xml
|
|
||||||
- gate-project-config-gerrit
|
- gate-project-config-gerrit
|
||||||
- gate-project-config-grafyaml
|
- gate-project-config-grafyaml
|
||||||
- gate-project-config-layout
|
- gate-project-config-layout
|
||||||
@ -4126,7 +4108,6 @@ projects:
|
|||||||
template:
|
template:
|
||||||
- name: merge-check
|
- name: merge-check
|
||||||
check:
|
check:
|
||||||
- gate-project-config-compare-xml
|
|
||||||
- gate-project-config-layout
|
- gate-project-config-layout
|
||||||
- gate-project-config-example-linters-ubuntu-trusty
|
- gate-project-config-example-linters-ubuntu-trusty
|
||||||
- gate-project-config-example-linters-ubuntu-xenial
|
- gate-project-config-example-linters-ubuntu-xenial
|
||||||
|
Loading…
Reference in New Issue
Block a user