No OneTemporary
Actions

Size

28 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
	index a450eed..64f7a13 100644
	--- a/.gitlab-ci.yml
	+++ b/.gitlab-ci.yml
	@@ -1,49 +1,45 @@

	stages:
	- unit-test
	- build

	default:
	image: quay.io/podman/stable
	-
	-.auth:
	- script: &before
	+ before_script:
	- 'if [ -n "${CI_COMMIT_REF_SLUG}" ]; then sudo -u podman podman login -u "$REGISTRY_USER" --password-stdin "$REGISTRY" <<< "$REGISTRY_PASSWORD"; fi'
	- IMAGE_PREFIX="$REGISTRY/infra/lilybuild"
	- IMAGE_VER="${CI_COMMIT_REF_SLUG-none}"

	.push:
	script: &push
	- if [ -n "${CI_COMMIT_REF_SLUG}" ]; then sudo -u podman podman push "$IMAGE"; fi

	unit-test:
	stage: unit-test
	image: docker.io/buildbot/buildbot-master:v4.2.1
	+ before_script: []
	script:
	- /buildbot_venv/bin/pip3 install jsonschema backports.tarfile
	- . /buildbot_venv/bin/activate
	- ./lilybuild/run-tests.sh

	build:master:
	stage: build
	script:
	- - *before
	- IMAGE="$IMAGE_PREFIX/buildbot-master:$IMAGE_VER"
	- sudo -u podman ./build-master.sh -t "$IMAGE"
	- *push

	build:worker:
	stage: build
	script:
	- - *before
	- IMAGE="$IMAGE_PREFIX/buildbot-worker:$IMAGE_VER"
	- sudo -u podman ./build-worker.sh -t "$IMAGE"
	- *push

	build:volume-helper:
	stage: build
	script:
	- - *before
	- IMAGE="$IMAGE_PREFIX/volume-helper:$IMAGE_VER"
	- sudo -u podman ./build-volume-helper.sh -t "$IMAGE"
	- *push
	diff --git a/lilybuild/lilybuild/ci_steps.py b/lilybuild/lilybuild/ci_steps.py
	index ace304b..3d839db 100644
	--- a/lilybuild/lilybuild/ci_steps.py
	+++ b/lilybuild/lilybuild/ci_steps.py
	@@ -1,427 +1,415 @@

	from buildbot.plugins import *
	from buildbot.process import buildstep, logobserver
	from buildbot.interfaces import IRenderable
	from twisted.internet import defer
	from .ci_syntax import ci_file
	-from .helpers import rsync_rules_from_artifacts, ci_vars_to_cmds
	+from .helpers import rsync_rules_from_artifacts, get_job_script
	import re
	import sys

	def on_success(step):
	return step.build.results == util.SUCCESS

	-DEFAULT_SCRIPT_HEADER = '''\
	-#!/bin/sh
	-
	-set -e -x
	-cd /build
	-
	-'''
	-
	def fill_list(*args):
	return list(args)

	class RunCIJobStep(steps.BuildStep):
	# 200 MiB
	artifact_max_size = 200 * 1024 * 1024
	default_image = 'alpine'
	- script_header = DEFAULT_SCRIPT_HEADER
	master_job_artifact_dir_pattern = '%(kw:st)s/repos/%(prop:lilybuild_repo_id)s/builds/%(prop:lilybuild_root_build_id)s/jobs/%(kw:job)s/artifacts'
	artifact_file_name = 'artifacts.tar'
	master_job_artifact_file_name_pattern = master_job_artifact_dir_pattern + '/' + artifact_file_name
	master_pages_dir_pattern = '%(kw:st)s/repos/%(prop:lilybuild_repo_id)s/pages'

	def __init__(
	self,
	lbc,
	src_relative=None,
	src_dir=None,
	storage_dir=None,
	repo_id=None,
	result_relative=None,
	result_dir=None,
	artifact_stage_relative=None,
	artifact_stage_dir=None,
	job_prop=None,
	**kwargs):
	self.lbc = lbc
	self.src_relative = src_relative
	self.src_dir = src_dir
	self.work_root_dir = kwargs['workdir']
	self.script_dir = 'script'
	self.storage_dir = storage_dir
	self.repo_id = repo_id
	self.artifact_stage_relative = artifact_stage_relative
	self.artifact_stage_dir = artifact_stage_dir
	self.result_relative = result_relative
	self.result_dir = result_dir
	super().__init__(name='Run step', **kwargs)

	@defer.inlineCallbacks
	def run(self):
	job_prop = self.getProperty('lilybuild_job_prop')
	job = ci_file.CIJob.from_prop(job_prop)
	job_index = self.getProperty('lilybuild_job_index')

	next_steps = yield self.job_to_steps(job, job_index)

	self.build.addStepsAfterCurrentStep(next_steps)
	return util.SUCCESS

	@defer.inlineCallbacks
	def get_ci_variables(self, job):
	res = {}
	res.update(job.get_predefined_ci_variables())
	res.update(self.getProperty('lilybuild_pipeline_vars'))
	res['CI_JOB_IMAGE'] = job.image or self.default_image
	res['CI_JOB_URL'] = yield self.build.getUrl()
	res['CI_JOB_ID'] = self.build.buildid
	res['CI_PROJECT_DIR'] = '/build'
	try:
	repo = self.lbc.repos[self.getProperty('lilybuild_repo_id')]
	variables = yield repo['variables_getter'](self.build)
	res_vars = {}
	for var in variables:
	value = variables[var]
	if IRenderable.providedBy(value):
	value = yield self.build.render(value)
	res_vars[var] = value
	res.update(res_vars)
	except Exception as e:
	self.addCompleteLog('exception', f'{e}')
	return res

	@defer.inlineCallbacks
	def job_to_steps(self, job, job_index):
	script_name = self.script_dir + '/run.sh'
	variables = yield self.get_ci_variables(job)
	- var_cmds = ci_vars_to_cmds(variables)
	script_step = steps.StringDownload(
	- self.script_header +
	- '\n' + var_cmds + '\n\n' +
	- '\n\n'.join(job.script),
	+ get_job_script(variables, job),
	name='Set up script',
	workerdest=script_name,
	workdir=self.work_root_dir,
	doStepIf=on_success,
	)

	chmod_step = steps.ShellCommand(
	name='Make script executable',
	command=['chmod', '+x', script_name],
	workdir=self.work_root_dir,
	doStepIf=on_success,
	)

	artifact_steps = []
	dep_job_indices = self.getProperty('lilybuild_dependency_job_indices')
	if dep_job_indices:
	for i in dep_job_indices:
	download_job = steps.FileDownload(
	mastersrc=util.Interpolate(
	self.master_job_artifact_file_name_pattern,
	st=self.storage_dir,
	job=i,
	),
	maxsize=self.artifact_max_size,
	name=f'Download artifacts from job #{i}',
	workerdest=self.artifact_file_name,
	workdir=self.work_root_dir,
	doStepIf=on_success,
	)

	unarchive_job = steps.ShellCommand(
	name=f'Unarchive artifacts from job #{i}',
	command=[
	'tar',
	'-xf',
	self.artifact_file_name,
	'-C',
	self.src_relative,
	],
	workdir=self.work_root_dir,
	doStepIf=on_success,
	)

	artifact_steps += [download_job, unarchive_job]

	run_step = steps.ShellCommand(
	name='Run script in container',
	command=[
	'/lilybuild/podman-helper',
	job.image or self.default_image,
	self.src_relative,
	self.script_dir,
	self.result_relative,
	],
	workdir=self.work_root_dir,
	doStepIf=on_success,
	)

	clean_script_step = steps.ShellCommand(
	name='Clean script dir',
	command=[
	'rm',
	'-rf',
	self.script_dir,
	],
	workdir=self.work_root_dir,
	alwaysRun=True,
	)

	steps_to_run = [script_step, chmod_step] + artifact_steps + [run_step, clean_script_step]
	if 'paths' in job.artifacts:
	clean_stage_dir_step = steps.ShellCommand(
	name='Clean stage dir',
	command=[
	'rm',
	'-rf',
	self.artifact_stage_relative,
	],
	workdir=self.work_root_dir,
	doStepIf=on_success,
	)
	collect_artifact_step = steps.ShellCommand(
	name='Collect artifacts',
	command=[
	'rsync',
	'-av',
	self.result_relative + '/',
	'--delete',
	'--prune-empty-dirs',
	] + rsync_rules_from_artifacts(job.artifacts) + [
	self.artifact_stage_relative,
	],
	workdir=self.work_root_dir,
	doStepIf=on_success,
	)
	archive_artifact_step = steps.ShellCommand(
	name='Archive artifacts',
	command=[
	'tar',
	'-cf',
	self.artifact_file_name,
	'-C',
	self.artifact_stage_relative,
	'.',
	],
	workdir=self.work_root_dir,
	doStepIf=on_success,
	)
	masterdest = util.Interpolate(
	self.master_job_artifact_file_name_pattern,
	st=self.storage_dir,
	job=job_index,
	doStepIf=on_success,
	)
	upload_artifact_step = steps.FileUpload(
	workersrc=self.artifact_file_name,
	maxsize=self.artifact_max_size,
	name='Upload artifacts',
	masterdest=masterdest,
	workdir=self.work_root_dir,
	doStepIf=on_success,
	)
	steps_to_run += [clean_stage_dir_step, collect_artifact_step, archive_artifact_step, upload_artifact_step]
	clean_stage_dir_again_step = steps.ShellCommand(
	name='Clean stage, result and artifact',
	command=[
	'rm',
	'-rf',
	self.artifact_stage_relative,
	self.result_relative,
	self.artifact_file_name,
	],
	workdir=self.work_root_dir,
	alwaysRun=True,
	)
	steps_to_run.append(clean_stage_dir_again_step)

	if job.is_pages() and 'paths' in job.artifacts:
	deploy_pages_step = steps.MasterShellCommand(
	command=util.Transform(fill_list,
	sys.executable,
	'-m', 'lilybuild.pages',
	util.Interpolate(
	self.master_pages_dir_pattern,
	st=self.storage_dir,
	),
	masterdest,
	),
	name='Deploy pages',
	logEnviron=False,
	doStepIf=on_success,
	)
	steps_to_run.append(deploy_pages_step)

	return steps_to_run

	class TriggerMultipleJobsStep(steps.Trigger):
	properties_to_keep = [
	'branch',
	'revision',
	'repository',
	'harbormaster_build_target_phid',
	'harbormaster_variable_buildable.diff',
	'harbormaster_variable_repository.staging.ref',
	'harbormaster_variable_repository.staging.uri',
	'harbormaster_variable_repository.uri',
	'lilybuild_repo',
	'lilybuild_repo_id',
	'lilybuild_pipeline_vars',
	]

	def __init__(self, lbc, jobs_with_data, **kwargs):
	self.lbc = lbc
	self.jobs = jobs_with_data
	super().__init__(schedulerNames=[self.lbc.triggerable_scheduler_name], **kwargs)

	def getSchedulersAndProperties(self):
	ret = []
	common_properties = {
	'lilybuild_root_build_id': self.build.buildid,
	}
	for prop in self.properties_to_keep:
	if self.hasProperty(prop):
	common_properties[prop] = self.getProperty(prop)

	for (job, i, dep_job_indices) in self.jobs:
	properties = common_properties.copy()
	properties['lilybuild_job_prop'] = job.to_prop()
	properties['lilybuild_job_index'] = i
	properties['virtual_builder_name'] = 'lilybuild-job - ' + common_properties['lilybuild_repo'] + ' - ' + job.name
	properties['lilybuild_dependency_job_indices'] = dep_job_indices
	ret.append({
	'sched_name': self.lbc.triggerable_scheduler_name,
	'props_to_set': properties,
	'unimportant': False,
	})

	return ret

	class AnalyzeCIFileCommand(buildstep.ShellMixin, steps.BuildStep):
	ci_def_file = '.gitlab-ci.yml'
	build_target_prop_name = 'harbormaster_build_target_phid'

	def __init__(
	self,
	lbc,
	src_relative=None,
	src_dir=None,
	storage_dir=None,
	repo_id=None,
	result_relative=None,
	result_dir=None,
	artifact_stage_relative=None,
	artifact_stage_dir=None,
	**kwargs):
	kwargs['name'] = 'Analyze CI file'
	kwargs['command'] = ['cat', self.ci_def_file]
	self.lbc = lbc
	self.src_relative = src_relative
	self.src_dir = src_dir
	self.work_root_dir = kwargs['workdir']
	self.script_dir = 'script'
	self.storage_dir = storage_dir
	self.repo_id = repo_id
	self.artifact_stage_relative = artifact_stage_relative
	self.artifact_stage_dir = artifact_stage_dir
	self.result_relative = result_relative
	self.result_dir = result_dir
	kwargs['workdir'] = self.src_dir
	kwargs = self.setupShellMixin(kwargs)
	super().__init__(**kwargs)
	self.observer = logobserver.BufferLogObserver()
	self.addLogObserver('stdio', self.observer)

	def stage_to_step(self, stage_name, stage_jobs, job_name_to_index_map, ci_file):
	jobs_with_data = []
	for job in stage_jobs:
	dep_job_names = [
	jn
	for jn in ci_file.get_jobs_to_pull_artifacts_from(job.name)
	if ci_file.jobs[jn].has_artifacts_archive()
	]
	dep_job_indices = [job_name_to_index_map[jn] for jn in dep_job_names]
	jobs_with_data.append((job, job_name_to_index_map[job.name], dep_job_indices))

	trigger = TriggerMultipleJobsStep(
	name=stage_name,
	lbc=self.lbc,
	jobs_with_data=jobs_with_data,
	waitForFinish=True,
	doStepIf=on_success,
	)

	return trigger

	def get_steps(self, stdout):
	f = ci_file.CIFile(stdout)

	stages = f.get_grouped_jobs()
	jobs = [job for (stage, js) in f.get_grouped_jobs() for job in js]
	job_names = [job.name for job in jobs]
	job_name_to_index_map = {}
	for (i, j) in enumerate(jobs):
	job_name_to_index_map[j.name] = i

	steps = [self.stage_to_step(stage_name, stage_jobs, job_name_to_index_map, f) for (stage_name, stage_jobs) in stages]
	print('steps:', steps)
	return steps

	def get_is_phorge(self):
	return not not self.getProperty(self.build_target_prop_name)

	def get_ref_and_type(self):
	ref_type = 'branch'
	ref = self.getProperty('branch')

	if self.getProperty('category') == 'tag':
	ref_type = 'tag'

	if ref is not None:
	m = re.match(r'^refs/(heads\|tags)/(.+)$', ref)
	if m:
	ref = m.group(2)

	return (ref, ref_type)

	@defer.inlineCallbacks
	def get_pipeline_ci_vars(self):
	url = yield self.build.getUrl()
	res = {
	'CI_PIPELINE_ID': self.build.buildid,
	'CI_PIPELINE_IID': self.build.buildid,
	'CI_PIPELINE_URL': url,
	'CI_PROJECT_ID': self.getProperty('lilybuild_repo_id'),
	'CI_CONFIG_PATH': self.ci_def_file,
	}
	if not self.get_is_phorge():
	res['CI_COMMIT_SHA'] = self.getProperty('got_revision')
	res['CI_COMMIT_SHORT_SHA'] = res['CI_COMMIT_SHA'][:8]
	(ref, ref_type) = self.get_ref_and_type()
	res['CI_COMMIT_REF_NAME'] = ref
	res['CI_COMMIT_REF_SLUG'] = ci_file.ci_slugify(ref)
	res['CI_COMMIT_REF_PROTECTED'] = 'false'
	if ref_type == 'tag':
	res['CI_COMMIT_TAG'] = ref
	elif ref_type == 'branch':
	res['CI_COMMIT_BRANCH'] = ref
	return res

	@defer.inlineCallbacks
	def run(self):
	# run './build.sh --list-stages' to generate the list of stages
	cmd = yield self.makeRemoteShellCommand()
	yield self.runCommand(cmd)

	# if the command passes extract the list of stages
	result = cmd.results()
	if result == util.SUCCESS:
	pipeline_vars = yield self.get_pipeline_ci_vars()
	self.setProperty('lilybuild_pipeline_vars', pipeline_vars, self.__class__.__name__)
	# create a ShellCommand for each stage and add them to the build
	self.build.addStepsAfterCurrentStep(self.get_steps(self.observer.getStdout()))

	return result
	diff --git a/lilybuild/lilybuild/helpers.py b/lilybuild/lilybuild/helpers.py
	index 07a1ea8..52830da 100644
	--- a/lilybuild/lilybuild/helpers.py
	+++ b/lilybuild/lilybuild/helpers.py
	@@ -1,49 +1,70 @@

	import json
	import shlex

	def normalize_path_for_rsync(path):
	n = path
	if n.startswith('./'):
	n = n[2:]
	if n.endswith('/'):
	n = n[:-1]

	return '/' + n

	def rsync_rules_from_artifacts(artifacts):
	paths = artifacts.get('paths', [])
	# Include all dirs
	rules = ['--include', '*/']
	for p in paths:
	normalized_path = normalize_path_for_rsync(p)
	rules += [
	# If path already has /** at the end, the second will actually do nothing,
	# but it's fine to add it anyway. The directory itself will still
	# be visited because of the --include */ option we add at the beginning.
	'--include', normalized_path,
	'--include', normalized_path + '/**',
	]

	# Exclude everything else
	rules += ['--exclude', '*']
	return rules

	def normalize_base_url(base_url):
	return base_url.rstrip('/') if base_url else None

	def phorge_token_to_arcrc(normalized_base_url, token):
	return json.dumps({
	'hosts': {
	normalized_base_url + '/api/': {
	'token': token,
	},
	},
	})

	def ci_vars_to_cmds(v):
	res = []
	for name in v:
	value = shlex.quote('{}'.format(v[name]))
	res.append(f'export {name}={value}')
	return '\n'.join(res)
	+
	+DEFAULT_SCRIPT_HEADER = '''\
	+#!/bin/sh
	+
	+set -e -x
	+cd /build
	+
	+'''
	+
	+def get_job_script(variables, job):
	+ var_cmds = ci_vars_to_cmds(variables)
	+
	+ return (
	+ DEFAULT_SCRIPT_HEADER +
	+ '\n' + var_cmds + '\n\n' +
	+ '\n\n'.join(job.before_script) + '\n\n' +
	+ '\n\n'.join(job.script) +
	+ '\n\nset +e\n\n' +
	+ '\n\n'.join(job.after_script) +
	+ '\n\nexit 0'
	+ )
	diff --git a/lilybuild/lilybuild/tests/ci_syntax/ci_file_test.py b/lilybuild/lilybuild/tests/ci_syntax/ci_file_test.py
	index 8997573..e906bce 100644
	--- a/lilybuild/lilybuild/tests/ci_syntax/ci_file_test.py
	+++ b/lilybuild/lilybuild/tests/ci_syntax/ci_file_test.py
	@@ -1,115 +1,109 @@

	import unittest
	import yaml
	from lilybuild.ci_syntax.ci_file import CIFile, CIValidationError
	-import os
	-
	-self_dir = os.path.dirname(__file__)
	-res_dir = os.path.join(self_dir, 'res')
	-def get_res(name):
	- with open(os.path.join(res_dir, name + '.yaml'), 'r') as f:
	- return f.read()
	+from lilybuild.tests.resources import get_res

	class CIFileTest(unittest.TestCase):
	def test_empty(self):
	r = CIFile('')
	self.assertEqual(r.stages, [])
	self.assertEqual(r.jobs, {})

	def test_invalid(self):
	with self.assertRaises(yaml.composer.ComposerError) as m:
	r = CIFile('*xxx')

	def test_simple(self):
	r = CIFile(get_res('simple'))
	self.assertEqual(r.stages, ['build'])
	self.assertEqual(list(r.jobs), ['build-a'])
	self.assertEqual(r.jobs['build-a'].image, 'test')
	self.assertEqual(r.jobs['build-a'].before_script, ['ls'])
	self.assertEqual(r.jobs['build-a'].script, ['make', 'make install'])
	self.assertEqual(r.jobs['build-a'].after_script, ['find', 'echo ok'])

	def test_noscript(self):
	r = CIFile(get_res('noscript'))

	self.assertEqual(r.stages, ['build'])
	self.assertEqual(list(r.jobs), ['build-a'])
	self.assertEqual(r.jobs['build-a'].image, 'test')
	self.assertEqual(r.jobs['build-a'].script, [])

	def test_defaults(self):
	r = CIFile(get_res('defaults'))
	self.assertEqual(r.stages, ['build'])
	self.assertEqual(list(r.jobs), ['build-a'])
	self.assertEqual(r.jobs['build-a'].image, 'test')
	self.assertEqual(r.jobs['build-a'].before_script, ['ls'])
	self.assertEqual(r.jobs['build-a'].script, ['make', 'make install'])
	self.assertEqual(r.jobs['build-a'].after_script, ['find', 'echo ok'])

	def test_pages(self):
	r = CIFile(get_res('pages'))
	self.assertEqual(r.stages, ['test'])
	self.assertEqual(list(r.jobs), ['pages'])
	self.assertEqual(r.jobs['pages'].script, ['make docs'])
	self.assertTrue(r.jobs['pages'].is_pages())

	def test_pages_attr(self):
	r = CIFile(get_res('pages_attr'))
	self.assertFalse(r.jobs['not-pages'].is_pages())
	self.assertTrue(r.jobs['is-pages'].is_pages())

	def test_dotjobs(self):
	r = CIFile(get_res('dotjobs'))
	self.assertEqual(list(r.jobs), [])

	def test_no_such_stage(self):
	with self.assertRaises(CIValidationError) as m:
	r = CIFile(get_res('no_such_stage'))

	def test_default_stages(self):
	r = CIFile(get_res('default_stages'))
	self.assertEqual(r.jobs['a'].stage, 'build')
	self.assertEqual(r.jobs['b'].stage, 'test')
	self.assertEqual(r.jobs['c'].stage, 'deploy')
	self.assertEqual(r.jobs['d'].stage, '.pre')
	self.assertEqual(r.jobs['e'].stage, '.post')
	self.assertEqual(r.jobs['f'].stage, 'test')

	def test_group_jobs(self):
	r = CIFile(get_res('group_jobs'))
	groups = r.get_grouped_jobs()
	self.assertEqual(len(groups), 2)
	self.assertEqual(groups[0][0], 'build')
	self.assertEqual(len(groups[0][1]), 2)
	self.assertTrue(next(j for j in groups[0][1] if j.name == 'a'))
	self.assertTrue(next(j for j in groups[0][1] if j.name == 'b'))
	self.assertEqual(groups[1][0], 'test')
	self.assertEqual(len(groups[1][1]), 2)
	self.assertTrue(next(j for j in groups[1][1] if j.name == 'c'))
	self.assertTrue(next(j for j in groups[1][1] if j.name == 'd'))

	def test_dependencies(self):
	r = CIFile(get_res('dependencies'))
	self.assertEqual(r.get_jobs_to_pull_artifacts_from('a'), [])
	self.assertEqual(r.get_jobs_to_pull_artifacts_from('a2'), [])
	self.assertEqual(r.get_jobs_to_pull_artifacts_from('b'), ['a'])
	self.assertEqual(set(r.get_jobs_to_pull_artifacts_from('b2')), set(['a', 'a2']))

	def test_nonexistent_dep(self):
	with self.assertRaises(CIValidationError) as m:
	r = CIFile(get_res('nonexistent_dep'))
	self.assertEqual(str(m.exception), 'Dependency "a3" of job "b" does not exist')

	def test_late_dep(self):
	with self.assertRaises(CIValidationError) as m:
	r = CIFile(get_res('late_dep'))
	self.assertEqual(str(m.exception), 'Dependency "a2" of job "a" is not before the job in stage')

	def test_has_artifacts_archive(self):
	r = CIFile(get_res('has_artifacts_archive'))
	self.assertTrue(r.jobs['has_archive'].has_artifacts_archive())
	self.assertFalse(r.jobs['no_archive'].has_artifacts_archive())
	self.assertFalse(r.jobs['no_artifacts'].has_artifacts_archive())

	if __name__ == '__main__':
	unittest.main()
	diff --git a/lilybuild/lilybuild/tests/helpers_test.py b/lilybuild/lilybuild/tests/helpers_test.py
	index e169475..d688019 100644
	--- a/lilybuild/lilybuild/tests/helpers_test.py
	+++ b/lilybuild/lilybuild/tests/helpers_test.py
	@@ -1,84 +1,132 @@

	import unittest
	import json
	-from lilybuild.helpers import rsync_rules_from_artifacts, normalize_base_url, phorge_token_to_arcrc, ci_vars_to_cmds
	+from lilybuild.ci_syntax.ci_file import CIFile
	+from lilybuild.helpers import (
	+ rsync_rules_from_artifacts,
	+ normalize_base_url,
	+ phorge_token_to_arcrc,
	+ ci_vars_to_cmds,
	+ get_job_script,
	+ DEFAULT_SCRIPT_HEADER,
	+)
	+from lilybuild.tests.resources import get_res

	class RsyncRulesTest(unittest.TestCase):
	def test_empty(self):
	self.assertEqual(
	rsync_rules_from_artifacts({}),
	['--include', '/', '--exclude', '']
	)

	def test_simple(self):
	self.assertEqual(
	rsync_rules_from_artifacts({'paths': ['public']}),
	['--include', '*/',
	'--include', '/public',
	'--include', '/public/**',
	'--exclude', '*']
	)

	def test_dotslash(self):
	self.assertEqual(
	rsync_rules_from_artifacts({'paths': ['./public/']}),
	['--include', '*/',
	'--include', '/public',
	'--include', '/public/**',
	'--exclude', '*']
	)

	def test_doublestar(self):
	self.assertEqual(
	rsync_rules_from_artifacts({'paths': ['./public/**']}),
	['--include', '*/',
	'--include', '/public/**',
	'--include', '/public//',
	'--exclude', '*']
	)

	def test_doublestar_middle(self):
	self.assertEqual(
	rsync_rules_from_artifacts({'paths': ['./public/*/.html']}),
	['--include', '*/',
	'--include', '/public/*/.html',
	'--include', '/public/*/.html/**',
	'--exclude', '*']
	)

	def test_dotdotslash(self):
	# No exploit possible because rsync will not visit beyond the source root
	self.assertEqual(
	rsync_rules_from_artifacts({'paths': ['../etc/passwd']}),
	['--include', '*/',
	'--include', '/../etc/passwd',
	'--include', '/../etc/passwd/**',
	'--exclude', '*']
	)

	class PhorgeUtilsTest(unittest.TestCase):
	def test_normalize_base_url(self):
	self.assertEqual(normalize_base_url('https://iron.lily-is.land/'), 'https://iron.lily-is.land')
	self.assertEqual(normalize_base_url('https://iron.lily-is.land'), 'https://iron.lily-is.land')
	self.assertEqual(normalize_base_url(''), None)

	def test_phorge_token_to_arcrc(self):
	self.assertEqual(
	json.loads(phorge_token_to_arcrc('https://iron.lily-is.land', 'some-token')),
	{
	'hosts': {
	'https://iron.lily-is.land/api/': {
	'token': 'some-token',
	},
	},
	},
	)

	class CiVarsTest(unittest.TestCase):
	def test_simple(self):
	self.assertEqual(ci_vars_to_cmds({}), '')
	self.assertEqual(ci_vars_to_cmds({'VAR': 'val'}), 'export VAR=val')
	self.assertEqual(ci_vars_to_cmds({'VAR': 'foo bar'}), "export VAR='foo bar'")

	+class GetJobScriptTest(unittest.TestCase):
	+ def test_only_script(self):
	+ r = CIFile(get_res('pages_attr'))
	+ job_script = get_job_script({}, r.jobs['is-pages'])
	+ self.assertEqual(job_script, f'''\
	+{DEFAULT_SCRIPT_HEADER}
	+
	+
	+
	+
	+make docs
	+
	+set +e
	+
	+
	+
	+exit 0''')
	+
	+ def test_before_and_after(self):
	+ r = CIFile(get_res('defaults'))
	+ job_script = get_job_script({}, r.jobs['build-a'])
	+ self.assertEqual(job_script, f'''\
	+{DEFAULT_SCRIPT_HEADER}
	+
	+
	+ls
	+
	+make
	+
	+make install
	+
	+set +e
	+
	+find
	+
	+echo ok
	+
	+exit 0''')
	+
	if __name__ == '__main__':
	unittest.main()
	diff --git a/lilybuild/lilybuild/tests/resources.py b/lilybuild/lilybuild/tests/resources.py
	new file mode 100644
	index 0000000..21e9b0e
	--- /dev/null
	+++ b/lilybuild/lilybuild/tests/resources.py
	@@ -0,0 +1,9 @@
	+
	+import os
	+
	+self_dir = os.path.dirname(__file__)
	+res_dir = os.path.join(self_dir, 'ci_syntax', 'res')
	+
	+def get_res(name):
	+ with open(os.path.join(res_dir, name + '.yaml'), 'r') as f:
	+ return f.read()

File Metadata

Mime Type: text/x-diff
Expires: Fri, Oct 9, 4:28 AM (1 d, 9 h)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 1784443
Default Alt Text: (28 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions