OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ci/b2c: rename B2C_TEST_SCRIPT to B2C_CONTAINER_CMD to match the automatic import

Browse Source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26653>
This commit is contained in:
Eric Engestrom
2023-12-13 10:25:29 +00:00
committed by Marge Bot
parent 4362d5913f
commit b93d836e47
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitlab-ci/b2c/generate_b2c.py
View File

@@ -38,7 +38,6 @@ env = Environment(loader=FileSystemLoader(path.dirname(values['job_template'])),
template = env.get_template(path.basename(values['job_template'])) template = env.get_template(path.basename(values['job_template']))
values['ci_job_id'] = environ['CI_JOB_ID'] values['ci_job_id'] = environ['CI_JOB_ID']
values['container_cmd'] = values['test_script']
try: try:
values['tags'] = json.loads(environ['CI_RUNNER_TAGS']) values['tags'] = json.loads(environ['CI_RUNNER_TAGS'])
except json.decoder.JSONDecodeError: except json.decoder.JSONDecodeError:

2
.gitlab-ci/test/gitlab-ci.yml
View File

@@ -343,7 +343,7 @@ clang-format:
[ -d "$CI_B2C_ARTIFACTS" ] || exit 1 [ -d "$CI_B2C_ARTIFACTS" ] || exit 1
[ -d "$CI_COMMON_SCRIPTS" ] || exit 1 [ -d "$CI_COMMON_SCRIPTS" ] || exit 1
export B2C_TEST_SCRIPT="bash -euc 'tar xf ${INSTALL_TARBALL_NAME}; ./install/common/init-stage2.sh'" export B2C_CONTAINER_CMD="bash -euc 'tar xf ${INSTALL_TARBALL_NAME}; ./install/common/init-stage2.sh'"
# The Valve CI gateway receives jobs in a YAML format. Create a # The Valve CI gateway receives jobs in a YAML format. Create a
# job description from the CI environment. # job description from the CI environment.