bartvdbraak/builder.braak.pro
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Change environment variable setup
All checks were successful
/ checks (pull_request) Successful in 15s
Details

Browse source
This commit is contained in:
Bart van der Braak 2024-11-20 02:29:30 +01:00
parent d6bce1b39d
commit 77ae214d24
23 changed files with 113 additions and 122 deletions
Download patch file Download diff file Expand all files Collapse all files

4
config/pipeline/__init__.py
View file

@ -23,7 +23,7 @@ importlib.reload(pipeline.common)
importlib.reload(conf.branches)
def populate(devops_env_id):
def populate(ENVIRONMENT):
pipelines_modules = [
pipeline.code,
pipeline.code_benchmark,
@ -41,7 +41,7 @@ def populate(devops_env_id):
for pipelines_module in pipelines_modules:
importlib.reload(pipelines_module)
b, s = pipelines_module.populate(devops_env_id)
b, s = pipelines_module.populate(ENVIRONMENT)
builders += b
schedulers += s

24
config/pipeline/code.py
View file

@ -233,7 +233,7 @@ scheduler_properties = {
@buildbot.plugins.util.renderer
def create_code_worker_command_args(
props, devops_env_id, track_id, pipeline_type, step_name
props, ENVIRONMENT, track_id, pipeline_type, step_name
):
commit_id = pipeline.common.fetch_property(props, key="revision", default="HEAD")
patch_id = pipeline.common.fetch_property(props, key="patch_id", default="")
@ -294,9 +294,7 @@ def create_code_worker_command_args(
args += [step_name]
return pipeline.common.create_worker_command(
"code.py", devops_env_id, track_id, args
)
return pipeline.common.create_worker_command("code.py", ENVIRONMENT, track_id, args)
def needs_do_code_pipeline_step(step):
@ -451,17 +449,17 @@ class PlatformTrigger(plugins_steps.Trigger):
return schedulers
def populate(devops_env_id):
def populate(ENVIRONMENT):
builders = []
schedulers = []
platform_worker_names = conf.machines.fetch_platform_worker_names(devops_env_id)
platform_worker_names = conf.machines.fetch_platform_worker_names(ENVIRONMENT)
local_worker_names = conf.machines.fetch_local_worker_names()
worker_config = conf.worker.get_config(devops_env_id)
worker_config = conf.worker.get_config(ENVIRONMENT)
needs_incremental_schedulers = devops_env_id in ["PROD"]
needs_nightly_schedulers = devops_env_id in ["PROD"]
needs_incremental_schedulers = ENVIRONMENT in ["PROD"]
needs_nightly_schedulers = ENVIRONMENT in ["PROD"]
print("*** Creating [code] pipeline")
for track_id in code_track_ids:
@ -493,7 +491,7 @@ def populate(devops_env_id):
step_timeout_in_seconds = compile_gpu_step_timeout_in_seconds
step_command = create_code_worker_command_args.withArgs(
devops_env_id, track_id, pipeline_type, step_name
ENVIRONMENT, track_id, pipeline_type, step_name
)
step = buildbot.plugins.steps.ShellCommand(
@ -512,7 +510,7 @@ def populate(devops_env_id):
for master_step_name in pipeline.common.code_pipeline_master_step_names:
master_step_command = (
pipeline.common.create_master_command_args.withArgs(
devops_env_id,
ENVIRONMENT,
track_id,
pipeline_type,
master_step_name,
@ -536,7 +534,7 @@ def populate(devops_env_id):
pipeline_lint_factory = buildbot.plugins.util.BuildFactory()
for step_name in code_pipeline_lint_step_names:
step_command = create_code_worker_command_args.withArgs(
devops_env_id, track_id, pipeline_type, step_name
ENVIRONMENT, track_id, pipeline_type, step_name
)
pipeline_lint_factory.addStep(
@ -576,7 +574,7 @@ def populate(devops_env_id):
suitable_pipeline_worker_names = pipeline_worker_names
if (
platform_architecture == "linux-x86_64"
and devops_env_id != "LOCAL"
and ENVIRONMENT != "LOCAL"
):
selector = "rocky"
suitable_pipeline_worker_names = [

10
config/pipeline/code_benchmark.py
View file

@ -26,8 +26,8 @@ class LinkMultipleFileUpload(plugins_steps.MultipleFileUpload):
return
def create_deliver_step(devops_env_id):
worker_config = conf.worker.get_config(devops_env_id)
def create_deliver_step(ENVIRONMENT):
worker_config = conf.worker.get_config(ENVIRONMENT)
file_size_in_mb = 500 * 1024 * 1024
worker_source_path = pathlib.Path("../../../../git/blender-vdev/build_package")
@ -48,7 +48,7 @@ def create_deliver_step(devops_env_id):
)
def populate(devops_env_id):
def populate(ENVIRONMENT):
properties = [
buildbot.plugins.util.StringParameter(
name="commit_id",
@ -68,7 +68,7 @@ def populate(devops_env_id):
]
return pipeline.common.create_pipeline(
devops_env_id,
ENVIRONMENT,
"code-benchmark",
"code_benchmark.py",
[
@ -78,7 +78,7 @@ def populate(devops_env_id):
"compile-gpu",
"compile-install",
"benchmark",
partial(create_deliver_step, devops_env_id),
partial(create_deliver_step, ENVIRONMENT),
"clean",
],
{"vdev": "main"},

4
config/pipeline/code_bpy_deploy.py
View file

@ -9,11 +9,11 @@ import conf.branches
import pipeline.common
def populate(devops_env_id):
def populate(ENVIRONMENT):
properties = []
return pipeline.common.create_pipeline(
devops_env_id,
ENVIRONMENT,
"code-bpy-deploy",
"code_bpy_deploy.py",
[

4
config/pipeline/code_deploy.py
View file

@ -10,7 +10,7 @@ import conf.branches
import pipeline.common
def populate(devops_env_id):
def populate(ENVIRONMENT):
properties = [
buildbot.plugins.util.BooleanParameter(
name="needs_full_clean",
@ -22,7 +22,7 @@ def populate(devops_env_id):
]
return pipeline.common.create_pipeline(
devops_env_id,
ENVIRONMENT,
"code-artifacts-deploy",
"code_deploy.py",
[

12
config/pipeline/code_store.py
View file

@ -62,16 +62,16 @@ def create_deliver_binaries_windows_step(worker_config, track_id, pipeline_type)
)
def populate(devops_env_id):
def populate(ENVIRONMENT):
builders = []
schedulers = []
platform_worker_names = conf.machines.fetch_platform_worker_names(devops_env_id)
platform_worker_names = conf.machines.fetch_platform_worker_names(ENVIRONMENT)
local_worker_names = conf.machines.fetch_local_worker_names()
worker_config = conf.worker.get_config(devops_env_id)
worker_config = conf.worker.get_config(ENVIRONMENT)
needs_nightly_schedulers = devops_env_id == "PROD"
needs_nightly_schedulers = ENVIRONMENT == "PROD"
pipeline_type = "daily"
@ -108,7 +108,7 @@ def populate(devops_env_id):
else:
args = ["--store-id", store_id, step_name]
step_command = pipeline.common.create_worker_command(
"code_store.py", devops_env_id, track_id, args
"code_store.py", ENVIRONMENT, track_id, args
)
step = plugins_steps.ShellCommand(
@ -126,7 +126,7 @@ def populate(devops_env_id):
for master_step_name in pipeline.common.code_pipeline_master_step_names:
master_step_command = (
pipeline.common.create_master_command_args.withArgs(
devops_env_id,
ENVIRONMENT,
track_id,
pipeline_type,
master_step_name,

22
config/pipeline/common.py
View file

@ -57,7 +57,7 @@ def needs_do_doc_pipeline_step(step):
return True
def create_worker_command(script, devops_env_id, track_id, args):
def create_worker_command(script, ENVIRONMENT, track_id, args):
# This relative path assume were are in:
# ~/.devops/services/buildbot-worker/<builder-name>/build
# There appears to be no way to expand a tilde here?
@ -71,7 +71,7 @@ def create_worker_command(script, devops_env_id, track_id, args):
"--track-id",
track_id,
"--service-env-id",
devops_env_id,
ENVIRONMENT,
]
return cmd + list(args)
@ -79,7 +79,7 @@ def create_worker_command(script, devops_env_id, track_id, args):
@buildbot.plugins.util.renderer
def create_master_command_args(
props, devops_env_id, track_id, pipeline_type, step_name, single_platform
props, ENVIRONMENT, track_id, pipeline_type, step_name, single_platform
):
build_configuration = fetch_property(
props, key="build_configuration", default="release"
@ -116,7 +116,7 @@ def create_master_command_args(
"--track-id",
track_id,
"--service-env-id",
devops_env_id,
ENVIRONMENT,
]
return cmd + list(args)
@ -125,7 +125,7 @@ def create_master_command_args(
@buildbot.plugins.util.renderer
def create_pipeline_worker_command(
props,
devops_env_id,
ENVIRONMENT,
track_id,
script,
step_name,
@ -154,11 +154,11 @@ def create_pipeline_worker_command(
if "revision" in props and props["revision"]:
args += ["--commit-id", props["revision"]]
return create_worker_command(script, devops_env_id, track_id, args)
return create_worker_command(script, ENVIRONMENT, track_id, args)
def create_pipeline(
devops_env_id,
ENVIRONMENT,
artifact_id,
script,
steps,
@ -179,13 +179,13 @@ def create_pipeline(
builders = []
schedulers = []
platform_worker_names = conf.machines.fetch_platform_worker_names(devops_env_id)
platform_worker_names = conf.machines.fetch_platform_worker_names(ENVIRONMENT)
local_worker_names = conf.machines.fetch_local_worker_names()
needs_incremental_schedulers = (
incremental_properties is not None and devops_env_id in ["PROD"]
incremental_properties is not None and ENVIRONMENT in ["PROD"]
)
needs_nightly_schedulers = nightly_properties is not None and devops_env_id in [
needs_nightly_schedulers = nightly_properties is not None and ENVIRONMENT in [
"PROD"
]
track_ids = tracked_branch_ids.keys()
@ -210,7 +210,7 @@ def create_pipeline(
continue
step_command = create_pipeline_worker_command.withArgs(
devops_env_id,
ENVIRONMENT,
track_id,
script,
step,

4
config/pipeline/doc_api.py
View file

@ -8,7 +8,7 @@ import conf.branches
import pipeline.common
def populate(devops_env_id):
def populate(ENVIRONMENT):
properties = [
buildbot.plugins.util.BooleanParameter(
name="needs_full_clean",
@ -27,7 +27,7 @@ def populate(devops_env_id):
]
return pipeline.common.create_pipeline(
devops_env_id,
ENVIRONMENT,
"doc-api",
"doc_api.py",
[

4
config/pipeline/doc_developer.py
View file

@ -7,7 +7,7 @@ import buildbot.plugins
import pipeline.common
def populate(devops_env_id):
def populate(ENVIRONMENT):
properties = [
buildbot.plugins.util.BooleanParameter(
name="needs_package_delivery",
@ -19,7 +19,7 @@ def populate(devops_env_id):
]
return pipeline.common.create_pipeline(
devops_env_id,
ENVIRONMENT,
"doc-developer",
"doc_developer.py",
["update", "compile", "deliver"],

4
config/pipeline/doc_manual.py
View file

@ -8,7 +8,7 @@ import conf.branches
import pipeline.common
def populate(devops_env_id):
def populate(ENVIRONMENT):
properties = [
buildbot.plugins.util.BooleanParameter(
name="needs_package_delivery",
@ -27,7 +27,7 @@ def populate(devops_env_id):
]
return pipeline.common.create_pipeline(
devops_env_id,
ENVIRONMENT,
"doc-manual",
"doc_manual.py",
["configure-machine", "update", "compile", "package", "deliver", "clean"],

4
config/pipeline/doc_studio.py
View file

@ -7,7 +7,7 @@ import buildbot.plugins
import pipeline.common
def populate(devops_env_id):
def populate(ENVIRONMENT):
properties = [
buildbot.plugins.util.BooleanParameter(
name="needs_package_delivery",
@ -19,7 +19,7 @@ def populate(devops_env_id):
]
return pipeline.common.create_pipeline(
devops_env_id,
ENVIRONMENT,
"doc-studio-tools",
"doc_studio.py",
["update", "compile", "deliver"],