forked from Bitmessage/buildbot_multibuild
Compare commits
No commits in common. "7929e6dd37ed7e5dc68e1327f9a6e20a81e5b7b4" and "master" have entirely different histories.
7929e6dd37
...
master
|
|
@ -1,5 +1,5 @@
|
|||
from os import getcwd, listdir
|
||||
from os.path import exists, isfile, islink, join, realpath
|
||||
from os import listdir
|
||||
from os.path import exists, isfile, join, islink
|
||||
import requests
|
||||
import re
|
||||
from subprocess import Popen, PIPE
|
||||
|
|
@ -16,8 +16,8 @@ dockerfile_extra_contents = {}
|
|||
dockerfile_extra_contents['focal'] = """
|
||||
|
||||
# Buildbot
|
||||
RUN apt-get update -y && apt-get install -yq --no-install-suggests --no-install-recommends \
|
||||
python3-buildbot-worker git subversion python3-dev libffi-dev python3-setuptools \
|
||||
RUN apt-get install -yq --no-install-suggests --no-install-recommends \
|
||||
buildbot-worker git subversion python3-dev libffi-dev python3-setuptools \
|
||||
python3-pip dumb-init curl openssh-client wget
|
||||
|
||||
# buildbot entrypoint
|
||||
|
|
@ -35,7 +35,7 @@ ENTRYPOINT /usr/local/bin/buildbot_entrypoint.sh "$BUILDMASTER" "$WORKERNAME" "$
|
|||
dockerfile_extra_contents['bionic'] = """
|
||||
|
||||
# Buildbot
|
||||
RUN apt-get update -y && apt-get install -yq --no-install-suggests --no-install-recommends \
|
||||
RUN apt-get install -yq --no-install-suggests --no-install-recommends \
|
||||
buildbot-slave git subversion python3-dev libffi-dev python3-setuptools \
|
||||
python3-pip dumb-init curl openssh-client wget
|
||||
|
||||
|
|
@ -51,48 +51,6 @@ ENTRYPOINT /usr/local/bin/buildbot_entrypoint.sh "$BUILDMASTER" "$WORKERNAME" "$
|
|||
|
||||
"""
|
||||
|
||||
dockerfile_extra_contents['jammy'] = """
|
||||
|
||||
# Buildbot
|
||||
RUN apt-get update -y && apt-get install -yq --no-install-suggests --no-install-recommends \
|
||||
python3-buildbot-worker git subversion python3-dev libffi-dev python3-setuptools \
|
||||
python3-pip dumb-init curl openssh-client wget
|
||||
|
||||
# buildbot entrypoint
|
||||
RUN wget -O /usr/local/bin/buildbot_entrypoint.sh https://git.bitmessage.org/Bitmessage/buildbot-scripts/raw/branch/master/docker/bionic/entrypoint.sh
|
||||
RUN chmod +x /usr/local/bin/buildbot_entrypoint.sh
|
||||
|
||||
RUN echo 'buildbot ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
|
||||
|
||||
USER buildbot
|
||||
|
||||
ENTRYPOINT /usr/local/bin/buildbot_entrypoint.sh "$BUILDMASTER" "$WORKERNAME" "$WORKERPASS"
|
||||
|
||||
"""
|
||||
|
||||
dockerfile_extra_contents['xenial'] = """
|
||||
|
||||
# Buildbot
|
||||
RUN apt-get update -y && apt-get install -yq --no-install-suggests --no-install-recommends \
|
||||
buildbot-slave git subversion python3-dev libffi-dev python3-setuptools \
|
||||
python3-pip curl openssh-client wget \
|
||||
python-setuptools python-psutil libssl-dev python-dev libgmp-dev python-virtualenv
|
||||
|
||||
# dumb-init
|
||||
RUN wget https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_amd64.deb
|
||||
RUN dpkg -i dumb-init_*.deb && rm -f dumb-init_*.deb
|
||||
|
||||
# buildbot entrypoint
|
||||
RUN wget -O /usr/local/bin/buildbot_entrypoint.sh https://git.bitmessage.org/Bitmessage/buildbot-scripts/raw/branch/master/docker/xenial/entrypoint.sh
|
||||
RUN chmod +x /usr/local/bin/buildbot_entrypoint.sh
|
||||
|
||||
RUN echo 'buildbot ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
|
||||
|
||||
USER buildbot
|
||||
|
||||
ENTRYPOINT /usr/local/bin/buildbot_entrypoint.sh "$BUILDMASTER" "$WORKERNAME" "$WORKERPASS"
|
||||
|
||||
"""
|
||||
|
||||
def get_secret():
|
||||
with open("multibuild_parent_key.key", 'r') as f:
|
||||
|
|
@ -111,29 +69,20 @@ def list_jobs(directory=".buildbot"):
|
|||
flag = False
|
||||
for fname in files:
|
||||
filepath = join(directory, item, fname)
|
||||
# must exist
|
||||
if not exists(filepath):
|
||||
continue
|
||||
# must be a file
|
||||
if not isfile(filepath):
|
||||
flag = True
|
||||
break
|
||||
# symlink OK as long as it points to files within the repo
|
||||
if islink(filepath) \
|
||||
and not realpath(filepath).startswith(getcwd()):
|
||||
if islink(filepath) or not isfile(filepath):
|
||||
flag = True
|
||||
break
|
||||
if flag:
|
||||
continue
|
||||
if (exists(join(directory, item, 'Dockerfile'))
|
||||
and exists(join(directory, item, 'build.sh'))) \
|
||||
or exists(join(directory, item, 'test.sh')):
|
||||
if (exists(join(directory, item, 'Dockerfile')) and exists(join(directory, item, 'build.sh'))) or exists(join(directory, item, 'test.sh')):
|
||||
results.append(item)
|
||||
return results
|
||||
|
||||
|
||||
def get_revision(branch):
|
||||
proc = Popen(["git", "rev-parse", branch], stdout=PIPE)
|
||||
def get_revision():
|
||||
proc = Popen(["git", "rev-parse", "HEAD"], stdout=PIPE)
|
||||
retval = proc.stdout.read().strip()
|
||||
retval = retval.decode('utf-8')
|
||||
return retval
|
||||
|
|
@ -141,8 +90,7 @@ def get_revision(branch):
|
|||
|
||||
def _get_dockerfile_contents(dockerfile):
|
||||
"""
|
||||
Read contents of a Dockerfile and add buildbot worker bootstrap
|
||||
for a given os_codename
|
||||
Read contents of a Dockerfile and add extra contents for the given os_codename
|
||||
"""
|
||||
os_codename = 'bionic'
|
||||
res = ""
|
||||
|
|
@ -157,7 +105,6 @@ def _get_dockerfile_contents(dockerfile):
|
|||
if m:
|
||||
inside_allowed_command = True
|
||||
if m.group(1) == "FROM":
|
||||
os_codename = m.group().split()[1].split(":")[1]
|
||||
has_from = True
|
||||
if inside_allowed_command:
|
||||
res += line
|
||||
|
|
@ -167,15 +114,10 @@ def _get_dockerfile_contents(dockerfile):
|
|||
|
||||
if not has_from:
|
||||
return None
|
||||
|
||||
try:
|
||||
return res + dockerfile_extra_contents[os_codename]
|
||||
except KeyError:
|
||||
return None
|
||||
return res + dockerfile_extra_contents[os_codename]
|
||||
|
||||
|
||||
def trigger_child_hooks(buildbotUrl: str, repository, branch, revision,
|
||||
directory=".buildbot"):
|
||||
def trigger_child_hooks(buildbotUrl: str, repository, branch, directory=".buildbot"):
|
||||
request_url = buildbotUrl + ty
|
||||
# List all jobs in the directory
|
||||
jobs = list_jobs(directory)
|
||||
|
|
@ -184,7 +126,7 @@ def trigger_child_hooks(buildbotUrl: str, repository, branch, revision,
|
|||
"X-Multibuild-Trigger": get_secret(),
|
||||
"Accept": "text/plain",
|
||||
}
|
||||
# revision = get_revision(branch)
|
||||
revision = get_revision()
|
||||
|
||||
# Check if build.sh or test.sh exists in each of the jobs
|
||||
for job in jobs:
|
||||
|
|
@ -218,24 +160,21 @@ def trigger_child_hooks(buildbotUrl: str, repository, branch, revision,
|
|||
"project": "/".join(repository.split("/")[-2:]),
|
||||
}
|
||||
|
||||
retval = requests.post(request_url, headers=request_headers,
|
||||
json=request_data)
|
||||
print("Triggered job for {} on {}: {}".format(job, request_url,
|
||||
retval.text))
|
||||
retval = requests.post(request_url, headers=request_headers, json=request_data)
|
||||
print("Triggered job for {} on {}: {}".format(job, request_url, retval.text))
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
# expect jobname, repository, branch, buildbotUrl from command line
|
||||
import sys
|
||||
|
||||
if len(sys.argv) == 5:
|
||||
if len(sys.argv) == 4:
|
||||
buildbotUrl = sys.argv[1]
|
||||
repository = sys.argv[2]
|
||||
branch = sys.argv[3]
|
||||
revision = sys.argv[4]
|
||||
|
||||
trigger_child_hooks(buildbotUrl, repository, branch, revision)
|
||||
trigger_child_hooks(buildbotUrl, repository, branch)
|
||||
else:
|
||||
sys.exit(
|
||||
"Usage: python3 multibuild.py <buildbotUrl> <repository> <branch> <revision>"
|
||||
"Usage: python3 multibuild.py <buildbotUrl> <repository> <branch>"
|
||||
)
|
||||
|
|
|
|||
|
|
@ -32,16 +32,33 @@ def add_parent_step(build_factory):
|
|||
Add a step to the parent build factory that will trigger the child hooks
|
||||
"""
|
||||
|
||||
build_factory.addStep(steps.ShellCommand(
|
||||
name="Update APT cache",
|
||||
command=["sudo", "apt", "update"]
|
||||
))
|
||||
|
||||
build_factory.addStep(steps.ShellCommand(
|
||||
name="Install dependencies",
|
||||
command=["sudo", "apt", "-y", "install", "python3-requests"]
|
||||
))
|
||||
|
||||
build_factory.addStep(
|
||||
steps.FileDownload(
|
||||
workerdest="worker_multibuild.py",
|
||||
mastersrc="buildbot_multibuild/lib/worker_multibuild.py",
|
||||
mode=0o444
|
||||
)
|
||||
)
|
||||
|
||||
build_factory.addStep(
|
||||
steps.ShellCommand(
|
||||
name="Execute worker script",
|
||||
command=[
|
||||
"python3",
|
||||
'/usr/local/bin/worker_multibuild.py',
|
||||
'worker_multibuild.py',
|
||||
util.Property("buildboturl"),
|
||||
util.Property('repository'),
|
||||
util.Property('branch'),
|
||||
util.Property('revision')
|
||||
util.Property('branch')
|
||||
],
|
||||
)
|
||||
)
|
||||
|
|
|
|||
Loading…
Reference in New Issue