Skip to content

A
avocado

openeuler / avocado

通知 0
Star 0
Fork 0
A
avocado

体验新版 GitCode，发现更多精彩内容 >>

未验证 提交 ad23d5b2 编写于 作者: C Cleber Rosa
浏览文件
操作

Merge remote-tracking branch 'ldoktor/version2' 

Signed-off-by: NCleber Rosa <crosa@redhat.com>
上级 e10019db 0a5fdff3
隐藏空白更改
内联 并排
Showing with 82 addition and 99 deletion
Makefile
浏览文件 @ ad23d5b2
...@@ -58,9 +58,10 @@ all: ...@@ -58,9 +58,10 @@ all:
@echo "rpm: Generate binary RPMs" @echo "rpm: Generate binary RPMs"
@echo @echo
@echo "Release related targets:" @echo "Release related targets:"
@echo "source-release: Create source package for the latest tagged release" @echo "source-release: Create source package for the latest tagged release"
@echo "srpm-release: Generate a source RPM package (.srpm) for the latest tagged release" @echo "srpm-release: Generate a source RPM package (.srpm) for the latest tagged release"
@echo "rpm-release: Generate binary RPMs for the latest tagged release" @echo "rpm-release: Generate binary RPMs for the latest tagged release"
@echo "propagate-version: Propagate './VERSION' to all plugins/modules"
@echo @echo
source: clean source: clean
...@@ -210,6 +211,13 @@ variables: ...@@ -210,6 +211,13 @@ variables:
@echo "MOCK_CONFIG: $(MOCK_CONFIG)" @echo "MOCK_CONFIG: $(MOCK_CONFIG)"
@echo "PYTHON_DEVELOP_ARGS: $(PYTHON_DEVELOP_ARGS)" @echo "PYTHON_DEVELOP_ARGS: $(PYTHON_DEVELOP_ARGS)"
propagate-version:
for DIR in $(AVOCADO_PLUGINS); do\
if test -f "$$DIR/VERSION"; then\
echo ">> Updating $$DIR"; echo "$(VERSION)" > "$$DIR/VERSION";\
else echo ">> Skipping $$DIR"; fi;\
done
.PHONY: source install clean check link variables .PHONY: source install clean check link variables
# implicit rule/recipe for man page creation # implicit rule/recipe for man page creation
......
docs/source/MaintenanceGuide.rst
浏览文件 @ ad23d5b2
...@@ -11,119 +11,84 @@ details you need to pay attention to. ...@@ -11,119 +11,84 @@ details you need to pay attention to.
Bump the version number Bump the version number
======================= =======================
For the core Avocado versioning, two files need to receive a version update: For the Avocado versioning, two files need to receive a manual version update:
* ``VERSION`` * ``VERSION``
* ``python-avocado.spec`` * ``python-avocado.spec``
So, go through the Avocado code base and update the version number. At followed by ``make propagate-version`` to propagate this change to all
the time of this writing, the diff looks like this: optional and "linkabe" plugins sharing the parent dir (eg. ``avocado-vt``).
Don't forget to commit the changes of "linked" plugins as they live in
different repositories.
An example diff (after the ``make propagate-version``) looks like this:
.. code-block:: diff .. code-block:: diff
diff --git a/VERSION b/VERSION diff --git a/VERSION b/VERSION
index 98bc1f4..dd0353d 100644 index dd0353d..aafccd8 100644
--- a/VERSION --- a/VERSION
+++ b/VERSION +++ b/VERSION
@@ -1 +1 @@ @@ -1 +1 @@
-47.0 -48.0
+48.0 +49.0
diff --git a/optional_plugins/html/VERSION b/optional_plugins/html/VERSION
index dd0353d..aafccd8 100644
--- a/optional_plugins/html/VERSION
+++ b/optional_plugins/html/VERSION
@@ -1 +1 @@
-48.0
+49.0
diff --git a/optional_plugins/robot/VERSION b/optional_plugins/robot/VERSION
index dd0353d..aafccd8 100644
--- a/optional_plugins/robot/VERSION
+++ b/optional_plugins/robot/VERSION
@@ -1 +1 @@
-48.0
+49.0
diff --git a/optional_plugins/runner_docker/VERSION b/optional_plugins/runner_docker/VERSION
index dd0353d..aafccd8 100644
--- a/optional_plugins/runner_docker/VERSION
+++ b/optional_plugins/runner_docker/VERSION
@@ -1 +1 @@
-48.0
+49.0
diff --git a/optional_plugins/runner_remote/VERSION b/optional_plugins/runner_remote/VERSION
index dd0353d..aafccd8 100644
--- a/optional_plugins/runner_remote/VERSION
+++ b/optional_plugins/runner_remote/VERSION
@@ -1 +1 @@
-48.0
+49.0
diff --git a/optional_plugins/runner_vm/VERSION b/optional_plugins/runner_vm/VERSION
index dd0353d..aafccd8 100644
--- a/optional_plugins/runner_vm/VERSION
+++ b/optional_plugins/runner_vm/VERSION
@@ -1 +1 @@
-48.0
+49.0
diff --git a/python-avocado.spec b/python-avocado.spec diff --git a/python-avocado.spec b/python-avocado.spec
index 7071805..483ebce 100644 index 6a4b067..4b9dba8 100644
--- a/python-avocado.spec --- a/python-avocado.spec
+++ b/python-avocado.spec +++ b/python-avocado.spec
@@ -6,8 +6,8 @@ @@ -12,7 +12,7 @@
Summary: Framework with tools and libraries for Automated Testing Summary: Framework with tools and libraries for Automated Testing
Name: python-%{srcname} Name: python-%{srcname}
-Version: 47.0 -Version: 48.0
-Release: 1%{?dist} +Version: 49.0
+Version: 48.0 Release: 1%{?dist}
+Release: 0%{?dist}
License: GPLv2 License: GPLv2
Group: Development/Tools Group: Development/Tools
URL: http://avocado-framework.github.io/ @@ -259,6 +259,9 @@ examples of how to write tests on your own.
@@ -211,6 +211,9 @@ examples of how to write tests on your own.
%{_datadir}/avocado/wrappers %{_datadir}/avocado/wrappers
%changelog %changelog
+* Mon Apr 3 2017 Cleber Rosa <cleber@redhat.com> - 48.0-0 +* Wed Apr 12 2017 Lukas Doktor <ldoktor@redhat.com> - 49.0-0
+- New upstream release +- Testing release
+ +
* Wed Mar 8 2017 Cleber Rosa <cleber@redhat.com> - 47.0-1 * Mon Apr 3 2017 Cleber Rosa <cleber@localhost.localdomain> - 48.0-1
- Rename package to python-avocado and subpackges accordingly - Updated exclude directives and files for optional plugins
Then, for all the optional plugins, the version number on their
``setup.py`` files also needs to be bumped. Currently, the diff looks
like this:
.. code-block:: diff
diff --git a/optional_plugins/html/setup.py b/optional_plugins/html/setup.py
index eb8d584..4ba8675 100644
--- a/optional_plugins/html/setup.py
+++ b/optional_plugins/html/setup.py
@@ -19,7 +19,7 @@ from setuptools import setup, find_packages
setup(name='avocado_result_html',
description='Avocado HTML Report for Jobs',
- version='47.0',
+ version='48.0',
author='Avocado Developers',
author_email='avocado-devel@redhat.com',
url='http://avocado-framework.github.io/',
diff --git a/optional_plugins/robot/setup.py b/optional_plugins/robot/setup.py
index 1f44b72..700eba0 100644
--- a/optional_plugins/robot/setup.py
+++ b/optional_plugins/robot/setup.py
@@ -19,7 +19,7 @@ from setuptools import setup, find_packages
setup(name='avocado-robot',
description='Avocado Plugin for Execution of Robot Framework tests',
- version='47.0',
+ version='48.0',
author='Avocado Developers',
author_email='avocado-devel@redhat.com',
url='http://avocado-framework.github.io/',
diff --git a/optional_plugins/runner_docker/setup.py b/optional_plugins/runner_docker/setup.py
index 2d235c8..954c6e7 100644
--- a/optional_plugins/runner_docker/setup.py
+++ b/optional_plugins/runner_docker/setup.py
@@ -19,7 +19,7 @@ from setuptools import setup, find_packages
setup(name='avocado-runner-docker',
description='Avocado Runner for Execution on Docker Containers',
- version='47.0',
+ version='48.0',
author='Avocado Developers',
author_email='avocado-devel@redhat.com',
url='http://avocado-framework.github.io/',
diff --git a/optional_plugins/runner_remote/setup.py b/optional_plugins/runner_remote/setup.py
index 5fe58dc..5aae9c5 100644
--- a/optional_plugins/runner_remote/setup.py
+++ b/optional_plugins/runner_remote/setup.py
@@ -19,7 +19,7 @@ from setuptools import setup, find_packages
setup(name='avocado-runner-remote',
description='Avocado Runner for Remote Execution',
- version='47.0',
+ version='48.0',
author='Avocado Developers',
author_email='avocado-devel@redhat.com',
url='http://avocado-framework.github.io/',
diff --git a/optional_plugins/runner_vm/setup.py b/optional_plugins/runner_vm/setup.py
index 168464a..44b56e7 100644
--- a/optional_plugins/runner_vm/setup.py
+++ b/optional_plugins/runner_vm/setup.py
@@ -19,7 +19,7 @@ from setuptools import setup, find_packages
setup(name='avocado-runner-vm',
description='Avocado Runner for libvirt VM Execution',
- version='47.0',
+ version='48.0',
author='Avocado Developers',
author_email='avocado-devel@redhat.com',
url='http://avocado-framework.github.io/',
You can find on git such commits that will help you get oriented for other You can find on git such commits that will help you get oriented for other
repos. repos.
......
optional_plugins/html/MANIFEST.in
浏览文件 @ ad23d5b2
recursive-include avocado_result_html/resources * recursive-include avocado_result_html/resources *
\ No newline at end of file include VERSION
\ No newline at end of file
optional_plugins/html/setup.py
浏览文件 @ ad23d5b2
...@@ -18,7 +18,7 @@ from setuptools import setup, find_packages ...@@ -18,7 +18,7 @@ from setuptools import setup, find_packages
setup(name='avocado-framework-plugin-result-html', setup(name='avocado-framework-plugin-result-html',
description='Avocado HTML Report for Jobs', description='Avocado HTML Report for Jobs',
version='48.0', version=open("VERSION", "r").read().strip(),
author='Avocado Developers', author='Avocado Developers',
author_email='avocado-devel@redhat.com', author_email='avocado-devel@redhat.com',
url='http://avocado-framework.github.io/', url='http://avocado-framework.github.io/',
......
optional_plugins/robot/setup.py
浏览文件 @ ad23d5b2
...@@ -18,7 +18,7 @@ from setuptools import setup, find_packages ...@@ -18,7 +18,7 @@ from setuptools import setup, find_packages
setup(name='avocado-framework-plugin-robot', setup(name='avocado-framework-plugin-robot',
description='Avocado Plugin for Execution of Robot Framework tests', description='Avocado Plugin for Execution of Robot Framework tests',
version='48.0', version=open("VERSION", "r").read().strip(),
author='Avocado Developers', author='Avocado Developers',
author_email='avocado-devel@redhat.com', author_email='avocado-devel@redhat.com',
url='http://avocado-framework.github.io/', url='http://avocado-framework.github.io/',
......
optional_plugins/runner_docker/setup.py
浏览文件 @ ad23d5b2
...@@ -18,7 +18,7 @@ from setuptools import setup, find_packages ...@@ -18,7 +18,7 @@ from setuptools import setup, find_packages
setup(name='avocado-framework-plugin-runner-docker', setup(name='avocado-framework-plugin-runner-docker',
description='Avocado Runner for Execution on Docker Containers', description='Avocado Runner for Execution on Docker Containers',
version='48.0', version=open("VERSION", "r").read().strip(),
author='Avocado Developers', author='Avocado Developers',
author_email='avocado-devel@redhat.com', author_email='avocado-devel@redhat.com',
url='http://avocado-framework.github.io/', url='http://avocado-framework.github.io/',
......
optional_plugins/runner_remote/setup.py
浏览文件 @ ad23d5b2
...@@ -18,7 +18,7 @@ from setuptools import setup, find_packages ...@@ -18,7 +18,7 @@ from setuptools import setup, find_packages
setup(name='avocado-framework-plugin-runner-remote', setup(name='avocado-framework-plugin-runner-remote',
description='Avocado Runner for Remote Execution', description='Avocado Runner for Remote Execution',
version='48.0', version=open("VERSION", "r").read().strip(),
author='Avocado Developers', author='Avocado Developers',
author_email='avocado-devel@redhat.com', author_email='avocado-devel@redhat.com',
url='http://avocado-framework.github.io/', url='http://avocado-framework.github.io/',
......
optional_plugins/runner_vm/setup.py
浏览文件 @ ad23d5b2
...@@ -18,7 +18,7 @@ from setuptools import setup, find_packages ...@@ -18,7 +18,7 @@ from setuptools import setup, find_packages
setup(name='avocado-framework-plugin-runner-vm', setup(name='avocado-framework-plugin-runner-vm',
description='Avocado Runner for libvirt VM Execution', description='Avocado Runner for libvirt VM Execution',
version='48.0', version=open("VERSION", "r").read().strip(),
author='Avocado Developers', author='Avocado Developers',
author_email='avocado-devel@redhat.com', author_email='avocado-devel@redhat.com',
url='http://avocado-framework.github.io/', url='http://avocado-framework.github.io/',
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或