Skip to content

Commit

Permalink
Merge pull request #211 from plone/gforcada-plone-5.2
Browse files Browse the repository at this point in the history
Plone 5.2
  • Loading branch information
gforcada committed Oct 21, 2017
2 parents e8b8070 + 3ef8393 commit 2f32b25
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 13 deletions.
4 changes: 3 additions & 1 deletion docs/source/run-add-on-jobs.rst
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,12 @@ Test an add-on
==============
- go to http://jenkins.plone.org
- log in with your github user
- click on the `Test add-on against Plone 5.1 job <http://jenkins.plone.org/job/test-addon-5.1>`_
- click on the `Test add-on against Plone 5.2 job <http://jenkins.plone.org/job/test-addon-5.2>`_
or `Test add-on against Plone 5.1 job <http://jenkins.plone.org/job/test-addon-5.1>`_
or `Test add-on against Plone 5.0 job <http://jenkins.plone.org/job/test-addon-5.0>`_
or `Test add-on against Plone 4.3 job <http://jenkins.plone.org/job/test-addon-4.3>`_ if you are targeting that Plone version
- click on the huge button **Build with Parameters**
`Plone 5.2 <http://jenkins.plone.org/job/test-addon-5.2/build?delay=0sec>`_ or
`Plone 5.1 <http://jenkins.plone.org/job/test-addon-5.1/build?delay=0sec>`_ or
`Plone 5.0 <http://jenkins.plone.org/job/test-addon-5.0/build?delay=0sec>`_ or
`Plone 4.3 <http://jenkins.plone.org/job/test-addon-4.3/build?delay=0sec>`_
Expand Down
7 changes: 5 additions & 2 deletions docs/source/run-pull-request-jobs.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,12 @@ one needs to be sure that nothing breaks due to the changes made on the pull req

For that we have some special jenkins job meant for that:

- If the pull request targets Plone 5.2: http://jenkins.plone.org/job/pull-request-5.2
- If the pull request targets Plone 5.1: http://jenkins.plone.org/job/pull-request-5.1
- If the pull request targets Plone 5.0: http://jenkins.plone.org/job/pull-request-5.0
- If the pull request targets Plone 4.3: http://jenkins.plone.org/job/pull-request-4.3

If the pull request targets **both** 5.1 *and* 5.0 you need to run a job on each of the jenkins jobs mentioned above.
If the pull request targets **both** 5.2 *and* 5.1 you need to run a job on each of the jenkins jobs mentioned above.

Test a pull request
===================
Expand All @@ -25,10 +26,12 @@ Run a pull request job
----------------------
- go to http://jenkins.plone.org
- log in with your github user
- click on the `Pull Request 5.1 job <http://jenkins.plone.org/job/pull-request-5.1>`_
- click on the `Pull Request 5.2 job <http://jenkins.plone.org/job/pull-request-5.2>`_
or `Pull Request 5.1 job <http://jenkins.plone.org/job/pull-request-5.1>`_
or `Pull Request 5.0 job <http://jenkins.plone.org/job/pull-request-5.0>`_
or `Pull Request 4.3 job <http://jenkins.plone.org/job/pull-request-4.3>`_ if you are targeting that Plone version
- click on the huge button **Build with Parameters**
`Plone 5.2 <http://jenkins.plone.org/job/pull-request-5.2/build?delay=0sec>`_ or
`Plone 5.1 <http://jenkins.plone.org/job/pull-request-5.1/build?delay=0sec>`_ or
`Plone 5.0 <http://jenkins.plone.org/job/pull-request-5.0/build?delay=0sec>`_ or
`Plone 4.3 <http://jenkins.plone.org/job/pull-request-4.3/build?delay=0sec>`_
Expand Down
4 changes: 2 additions & 2 deletions docs/source/run-qa-on-package.rst
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ Get the QA configuration and bootstrap:

.. code-block:: shell
wget https://raw.githubusercontent.com/plone/buildout.coredev/5.1/bootstrap.py -O bootstrap.py
wget https://raw.githubusercontent.com/plone/buildout.coredev/5.1/experimental/qa.cfg -O qa.cfg
wget https://raw.githubusercontent.com/plone/buildout.coredev/5.2/bootstrap.py -O bootstrap.py
wget https://raw.githubusercontent.com/plone/buildout.coredev/5.2/experimental/qa.cfg -O qa.cfg
wget https://raw.githubusercontent.com/plone/plone.recipe.codeanalysis/master/.isort.cfg -O .isort.cfg
python bootstrap.py --setuptools-version 31.1.1 --buildout-version 2.8.0 -c qa.cfg
Expand Down
17 changes: 11 additions & 6 deletions jobs/jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,8 @@
- project:
name: Pull requests
plone-version:
- '5.2':
report-path: 'parts/test'
- '5.1':
report-path: 'parts/test'
- '5.0':
Expand All @@ -84,6 +86,7 @@
- project:
name: Test add-ons
plone-version:
- '5.2'
- '5.1'
- '5.0'
- '4.3'
Expand All @@ -93,6 +96,7 @@
- project:
name: Plone 5.x
plone-version:
- '5.2'
- '5.1'
- '5.0'
jobs:
Expand All @@ -117,29 +121,30 @@
plip:
- 680-restapi:
buildout: plips/plip-680-restapi.cfg
branch: 5.1
branch: 5.2
- mosaic:
buildout: plips/plip-mosaic.cfg
branch: 5.1
branch: 5.2
- zope4:
buildout: plip-zope4.cfg
branch: 5.1
branch: 5.2
- 1334-PlonePAS:
buildout: plips/plip-1334-PlonePAS.cfg
branch: 5.1
branch: 5.2
- 1485-react:
buildout: plips/plip-1485.cfg
branch: 5.1
branch: 5.2
- 2092-login:
buildout: plips/plip-2092-login.cfg
branch: 5.1
branch: 5.2
jobs:
- 'plip-{plip}'


- project:
name: Theme preview
plone-version:
- '5.2'
- '5.1'
- '5.0'
- '4.3'
Expand Down
4 changes: 2 additions & 2 deletions jobs/scripts/pkg-qa.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
wget https://raw.githubusercontent.com/plone/buildout.coredev/5.1/requirements.txt -O requirements.txt
wget https://raw.githubusercontent.com/plone/buildout.coredev/5.1/experimental/qa.cfg -O qa.cfg
wget https://raw.githubusercontent.com/plone/buildout.coredev/5.2/requirements.txt -O requirements.txt
wget https://raw.githubusercontent.com/plone/buildout.coredev/5.2/experimental/qa.cfg -O qa.cfg
wget https://raw.githubusercontent.com/plone/plone.recipe.codeanalysis/master/.isort.cfg -O .isort.cfg
sed -i 's#directory = src#directory = {top-level}#' qa.cfg
pip install -r requirements.txt
Expand Down

0 comments on commit 2f32b25

Please sign in to comment.