[pypy-commit] buildbot default: convert to heptapod
mattip
pypy.commits at gmail.com
Thu Feb 13 01:22:57 EST 2020
Author: Matti Picus <matti.picus at gmail.com>
Branch:
Changeset: r1136:22046f04c0a4
Date: 2020-02-12 18:02 +0200
http://foss.heptapod.net/pypy/buildbot/changeset/22046f04c0a4/
Log: convert to heptapod
diff --git a/README-CHROOT b/README-CHROOT
--- a/README-CHROOT
+++ b/README-CHROOT
@@ -61,7 +61,7 @@
apt install virtualenv buildbot-slave python-pytest python-hypothesis \
netbase gdb ncurses-term pypy locales mercurial
-and more from the instructions on https://bitbucket.org/pypy/buildbot
+and more from the instructions on https://foss.heptapod.net/pypy/buildbot
also, to make the rlocale tests work
diff --git a/README_BUILDSLAVE b/README_BUILDSLAVE
--- a/README_BUILDSLAVE
+++ b/README_BUILDSLAVE
@@ -39,7 +39,7 @@
the buildslave.
Finally you will need to update the buildmaster configuration found in
-https://bitbucket.org/pypy/buildbot/src/default/bot2/pypybuildbot/master.py
+https://foss.heptapod.net/pypy/buildbot/src/default/bot2/pypybuildbot/master.py
to associate the buildslave with one or more
builders. Builders define what tasks should be executed on the buildslave.
Once the changes are commited the buildmaster on MASTERHOST needs to be updated
diff --git a/bbhook/main.py b/bbhook/main.py
--- a/bbhook/main.py
+++ b/bbhook/main.py
@@ -1,10 +1,10 @@
#!/usr/bin/env python
"""
-POST hook for bitbucket. So far, it just sends the email diff.
+POST hook for foss.heptapod.net. So far, it just sends the email diff.
The idea is that the buildmaster user runs it inside a screen session on
-codespeak.
+the buildmaster.
"""
import json
@@ -25,7 +25,7 @@
return """
<html>
<p>
- This is the pypy bitbucket hook.
+ This is the pypy foss.heptapod.net hook.
Use the following form only for testing
</p>
<form method=post>
@@ -54,7 +54,7 @@
class DefaultConfig(object):
LOCAL_REPOS = py.path.local(__file__).dirpath('repos')
- REMOTE_BASE = 'http://bitbucket.org'
+ REMOTE_BASE = 'http://foss.heptapod.net'
USE_COLOR_CODES = True
LISTFILES = False
#
diff --git a/bbhook/repos/README b/bbhook/repos/README
--- a/bbhook/repos/README
+++ b/bbhook/repos/README
@@ -1,2 +1,2 @@
You must manually clone the repositories you want to follow. They must have
-the same path as on bitbucket (e.g., pypy/pypy must be in repos/pypy/pypy).
+the same path as on heptapod (e.g., pypy/pypy must be in repos/pypy/pypy).
diff --git a/bbhook/test_send_email.py b/bbhook/test_send_email.py
--- a/bbhook/test_send_email.py
+++ b/bbhook/test_send_email.py
@@ -1,6 +1,6 @@
def test_send_email():
from bbhook.mail import send
- body = "This is a test to see if the bitbucket hook can send emails to the pypy-commit mailing list"
+ body = "This is a test to see if the mercurial hook can send emails to the pypy-commit mailing list"
send('antocuni <noreply at buildbot.pypy.org>',
'pypy-commit at python.org',
"this is a test",
diff --git a/bot2/pypybuildbot/builds.py b/bot2/pypybuildbot/builds.py
--- a/bot2/pypybuildbot/builds.py
+++ b/bot2/pypybuildbot/builds.py
@@ -389,7 +389,7 @@
def setup_steps(platform, factory, workdir=None,
- repourl='https://bitbucket.org/pypy/pypy/',
+ repourl='https://foss.heptapod.net/pypy/pypy/',
force_branch=None):
factory.addStep(shell.SetPropertyFromCommand(
command=['python', '-c', "import tempfile, os ;print"
@@ -816,7 +816,7 @@
# Always use the latest version on the single-run branch of the
# benchmark repo,
# branch and revision refer to the pypy version to benchmark
- repourl = 'https://bitbucket.org/pypy/benchmarks'
+ repourl = 'https://foss.heptapod.net/pypy/benchmarks'
update_hg(platform, self, repourl, 'benchmarks', '', use_branch=True,
force_branch='single-run')
#
@@ -862,7 +862,7 @@
factory.BuildFactory.__init__(self)
#
- repourl = 'https://bitbucket.org/pypy/benchmarks'
+ repourl = 'https://foss.heptapod.net/pypy/benchmarks'
# benchmark_branch is the branch in the benchmark repo,
# the rest refer to the pypy version to benchmark
@@ -984,7 +984,7 @@
factory.BuildFactory.__init__(self)
# check out and update benchmarks
- repourl = 'https://bitbucket.org/pypy/benchmarks'
+ repourl = 'https://foss.heptapod.net/pypy/benchmarks'
update_hg(platform, self, repourl, 'benchmarks', 'default', use_branch=False)
# checks out and updates the repo
@@ -1049,7 +1049,7 @@
# clone
self.addStep(
Mercurial(
- repourl='https://bitbucket.org/pypy/buildbot',
+ repourl='https://foss.heptapod.net/pypy/buildbot',
mode='incremental',
method='fresh',
defaultBranch='default',
@@ -1152,7 +1152,7 @@
))
# obtain a pypy-compatible branch of numpy
- numpy_url = 'https://www.bitbucket.org/pypy/numpy'
+ numpy_url = 'https://foss.heptapod.net/pypy/numpy'
update_git(platform, self, numpy_url, 'numpy_src', branch='master',
alwaysUseLatest=True, # ignore pypy rev number when
# triggered by a pypy build
diff --git a/docker/Dockerfile b/docker/Dockerfile
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -81,7 +81,7 @@
# RUN wget -q http://buildbot.pypy.org/nightly/trunk/pypy-c-jit-98204-a8a24325ea83-linux.tar.bz2 -O - | tar -C /opt -xj
# RUN ln -s /opt/pypy-c-jit-98204-a8a24325ea83-linux/bin/pypy /usr/local/bin/pypy
-RUN wget -q https://bitbucket.org/squeaky/portable-pypy/downloads/pypy-7.0.0-linux_x86_64-portable.tar.bz2 -O - | tar -C /opt -xj
+RUN wget -q https://bitbucket.org/pypy/pypy/downloads/pypy2.7-v7.3.0-linux64.tar.bz2 -O - | tar -C /opt -xj
RUN ln -s /opt/pypy-7.0.0-linux_x86_64-portable/bin/pypy /usr/local/bin/pypy
RUN yum clean packages
diff --git a/docker/Dockerfile32 b/docker/Dockerfile32
--- a/docker/Dockerfile32
+++ b/docker/Dockerfile32
@@ -74,10 +74,8 @@
# get a pypy for translation. On x86_64 we can use portable pypy
# XXX update this to use release versions when we have one
-RUN wget -q http://buildbot.pypy.org/nightly/trunk/pypy-c-jit-98204-a8a24325ea83-linux.tar.bz2 -O - | tar -C /opt -xj
+RUN wget -q https://bitbucket.org/pypy/pypy/downloads/pypy2.7-v7.3.0-linux32.tar.bz2 -O - | tar -C /opt -xj
RUN ln -s /opt/pypy-c-jit-98204-a8a24325ea83-linux/bin/pypy /usr/local/bin/pypy
-# RUN wget -q https://bitbucket.org/squeaky/portable-pypy/downloads/pypy-7.0.0-linux_x86_64-portable.tar.bz2 -O - | tar -C /opt -xj
-# RUN ln -s /opt/pypy-7.0.0-linux_x86_64-portable/bin/pypy /usr/local/bin/pypy
RUN yum clean packages
More information about the pypy-commit
mailing list