From abf124a44ce2d2efeacece7823a13f6350be806c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Troels=20Beck=20Kr=C3=B8gh?= Date: Tue, 18 Jul 2017 11:40:46 +0200 Subject: [PATCH 1/4] Updated virtualenv version in the devpibootstrap --- devpi_jenkins/__init__.py | 2 +- devpi_jenkins/main.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/devpi_jenkins/__init__.py b/devpi_jenkins/__init__.py index afced14..3f39079 100644 --- a/devpi_jenkins/__init__.py +++ b/devpi_jenkins/__init__.py @@ -1 +1 @@ -__version__ = '2.0.0' +__version__ = '2.0.1' diff --git a/devpi_jenkins/main.py b/devpi_jenkins/main.py index a19afa6..c0646ad 100644 --- a/devpi_jenkins/main.py +++ b/devpi_jenkins/main.py @@ -35,8 +35,8 @@ def devpiserver_on_upload_sync(log, application_url, stage, project, version): INDEXURL=application_url + "/" + stage.name, VIRTUALENVTARURL=( application_url + - "/root/pypi/+f/f61/cdd983d2c4e6a/" - "virtualenv-1.11.6.tar.gz"), + "/root/pypi/+f/44e/19f4134906fe2/" + "virtualenv-15.1.0.tar.gz"), TESTSPEC='%s==%s' % (project, version), DEVPI_INSTALL_INDEX=application_url + "/" + stage.name + "/+simple/") inputfile = py.io.BytesIO(source.encode("ascii")) From 579915fa90a133f4105750cbd12c51056e1e94a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Troels=20Beck=20Kr=C3=B8gh?= Date: Tue, 18 Jul 2017 12:51:20 +0200 Subject: [PATCH 2/4] Writes testspec file containing the identifier for the build --- devpi_jenkins/devpibootstrap.py.template | 3 +++ 1 file changed, 3 insertions(+) diff --git a/devpi_jenkins/devpibootstrap.py.template b/devpi_jenkins/devpibootstrap.py.template index bef01e8..6f6bcd7 100644 --- a/devpi_jenkins/devpibootstrap.py.template +++ b/devpi_jenkins/devpibootstrap.py.template @@ -181,6 +181,9 @@ def main(indexurl = "{INDEXURL}", log("starting Jenkins job for %s" % testspec) basedir = os.getcwd() + with open('testspec', 'w') as f: + f.write(testspec) + # prepare a TMPDIR that resides in the Jenkins workspace # for installing devpi itself OLD_TMPDIR = os.environ.get("TMPDIR") From 7551809c5483a88f6b488037fb5c452dcd7a42cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Troels=20Beck=20Kr=C3=B8gh?= Date: Tue, 26 Sep 2017 14:17:57 +0200 Subject: [PATCH 3/4] Corrected test after changing url to virtualenv --- tests/test_jenkins.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_jenkins.py b/tests/test_jenkins.py index 5fac74a..72f10a6 100644 --- a/tests/test_jenkins.py +++ b/tests/test_jenkins.py @@ -40,6 +40,6 @@ def test_upload_with_jenkins(mapp, reqmock): script = fs.getfirst("file0") assert script.startswith(b'#!/') assert b'indexurl = "http://localhost/user1/dev"' in script - assert b'virtualenvtar_url = "http://localhost/root/pypi/+f/f61/cdd983d2c4e6a/virtualenv-1.11.6.tar.gz"' in script + assert b'virtualenvtar_url = "http://localhost/root/pypi/+f/44e/19f4134906fe2/virtualenv-15.1.0.tar.gz"' in script assert b'devpi_install_index = "http://localhost/user1/dev/+simple/"' in script assert b'testspec = "pkg1==2.6"' in script From 8654296e8500e5d0d219e3b0f0bc9991d28fe4af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Troels=20Beck=20Kr=C3=B8gh?= Date: Tue, 26 Sep 2017 16:18:51 +0200 Subject: [PATCH 4/4] Bumped version --- devpi_jenkins/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devpi_jenkins/__init__.py b/devpi_jenkins/__init__.py index 3f39079..668c344 100644 --- a/devpi_jenkins/__init__.py +++ b/devpi_jenkins/__init__.py @@ -1 +1 @@ -__version__ = '2.0.1' +__version__ = '2.0.2'