From 9fb097f4b792f6336b2f54c9ff9bf571753ede70 Mon Sep 17 00:00:00 2001 From: themylogin Date: Wed, 10 Sep 2025 21:51:02 +0200 Subject: [PATCH] Remove experimental build flag (#921) --- jenkins/Full-NoPublish | 2 +- jenkins/Incremental-NoPublish | 2 +- scale_build/config.py | 1 - scale_build/packages/build.py | 3 +-- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/jenkins/Full-NoPublish b/jenkins/Full-NoPublish index 61aa3a8..c90693e 100644 --- a/jenkins/Full-NoPublish +++ b/jenkins/Full-NoPublish @@ -33,7 +33,7 @@ pipeline { } stage('Packages') { steps { - sh 'cd src && env TRUENAS_EXPERIMENTAL=n make packages' + sh 'cd src && make packages' } } stage('Update') { diff --git a/jenkins/Incremental-NoPublish b/jenkins/Incremental-NoPublish index 466ba61..436b8c9 100644 --- a/jenkins/Incremental-NoPublish +++ b/jenkins/Incremental-NoPublish @@ -28,7 +28,7 @@ pipeline { } stage('Packages') { steps { - sh 'cd ${BDIR} && env TRUENAS_EXPERIMENTAL=n make packages' + sh 'cd ${BDIR} && make packages' } } stage('Update') { diff --git a/scale_build/config.py b/scale_build/config.py index 1e72a99..1322c09 100644 --- a/scale_build/config.py +++ b/scale_build/config.py @@ -52,7 +52,6 @@ TRY_BRANCH_OVERRIDE = get_env_variable('TRY_BRANCH_OVERRIDE', str) VERSION = get_env_variable('TRUENAS_VERSION', str, f'{_VERS}-{BUILD_TIME_OBJ.strftime("%Y%m%d-%H%M%S")}') TRUENAS_VENDOR = get_env_variable('TRUENAS_VENDOR', str) PRESERVE_ISO = get_env_variable('PRESERVE_ISO', bool, False) -TRUENAS_EXPERIMENTAL = get_env_variable('TRUENAS_EXPERIMENTAL', bool, True) # We will get branch overrides and identity file path overrides from here diff --git a/scale_build/packages/build.py b/scale_build/packages/build.py index f285ad9..da91a6e 100644 --- a/scale_build/packages/build.py +++ b/scale_build/packages/build.py @@ -5,7 +5,7 @@ import shlex import shutil from datetime import datetime -from scale_build.config import BUILD_TIME, VERSION, TRUENAS_EXPERIMENTAL +from scale_build.config import BUILD_TIME, VERSION from scale_build.exceptions import CallError from scale_build.utils.environment import APT_ENV from scale_build.utils.manifest import get_truenas_train, get_release_code_name, get_secret_env @@ -92,7 +92,6 @@ class BuildPackageMixin: 'train': get_truenas_train(), 'codename': get_release_code_name(), 'version': VERSION, - 'experimental': TRUENAS_EXPERIMENTAL, })) os.makedirs(os.path.join(self.package_source_with_chroot, 'etc'), exist_ok=True) with open(os.path.join(self.package_source_with_chroot, 'etc/version'), 'w') as f: