TrueNAS/scale-build
1
0
Fork 0
mirror of https://github.com/truenas/scale-build.git synced 2025-12-19 18:39:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove experimental build flag (#921)

Browse Source
This commit is contained in:
themylogin
2025-09-10 21:51:02 +02:00
committed by GitHub
parent fd49f8913f
commit 9fb097f4b7
4 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jenkins/Full-NoPublish
View File

@@ -33,7 +33,7 @@ pipeline {
} }
stage('Packages') { stage('Packages') {
steps { steps {
sh 'cd src && env TRUENAS_EXPERIMENTAL=n make packages' sh 'cd src && make packages'
} }
} }
stage('Update') { stage('Update') {

2
jenkins/Incremental-NoPublish
View File

@@ -28,7 +28,7 @@ pipeline {
} }
stage('Packages') { stage('Packages') {
steps { steps {
sh 'cd ${BDIR} && env TRUENAS_EXPERIMENTAL=n make packages' sh 'cd ${BDIR} && make packages'
} }
} }
stage('Update') { stage('Update') {

1
scale_build/config.py
View File

@@ -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")}') 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) TRUENAS_VENDOR = get_env_variable('TRUENAS_VENDOR', str)
PRESERVE_ISO = get_env_variable('PRESERVE_ISO', bool, False) 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 # We will get branch overrides and identity file path overrides from here

3
scale_build/packages/build.py
View File

@@ -5,7 +5,7 @@ import shlex
import shutil import shutil
from datetime import datetime 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.exceptions import CallError
from scale_build.utils.environment import APT_ENV from scale_build.utils.environment import APT_ENV
from scale_build.utils.manifest import get_truenas_train, get_release_code_name, get_secret_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(), 'train': get_truenas_train(),
'codename': get_release_code_name(), 'codename': get_release_code_name(),
'version': VERSION, 'version': VERSION,
'experimental': TRUENAS_EXPERIMENTAL,
})) }))
os.makedirs(os.path.join(self.package_source_with_chroot, 'etc'), exist_ok=True) 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: with open(os.path.join(self.package_source_with_chroot, 'etc/version'), 'w') as f: