Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

pyrex: replace BB_ENV_EXTRAWHITE with BB_ENV_PASSTHROUGH_ADDITIONS #76

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

pyrex: replace BB_ENV_EXTRAWHITE with BB_ENV_PASSTHROUGH_ADDITIONS #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions ci/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ def cleanup_env():
os.environ["PYREX_BUILD_QUIET"] = "0"
os.environ["PYREX_OEINIT"] = os.path.join(self.pokyroot, "oe-init-build-env")
os.environ["PYREX_CONFIG_BIND"] = PYREX_ROOT
for var in ("SSH_AUTH_SOCK", "BB_ENV_EXTRAWHITE"):
for var in ("SSH_AUTH_SOCK", "BB_ENV_PASSTHROUGH_ADDITIONS"):
if var in os.environ:
del os.environ[var]

Expand Down Expand Up @@ -766,17 +766,17 @@ def test_groups(self):

self.assertEqual(groups, my_groups)

def test_bb_env_extrawhite(self):
def test_BB_ENV_PASSTHROUGH_ADDITIONS(self):
env = os.environ.copy()
env["BB_ENV_EXTRAWHITE"] = "TEST_BB_EXTRA"
env["BB_ENV_PASSTHROUGH_ADDITIONS"] = "TEST_BB_EXTRA"
env["TEST_BB_EXTRA"] = "Hello"

s = set(
self.assertPyrexContainerShellCommand(
"echo $BB_ENV_EXTRAWHITE", env=env, quiet_init=True, capture=True
"echo $BB_ENV_PASSTHROUGH_ADDITIONS", env=env, quiet_init=True, capture=True
).split()
)
self.assertIn(env["BB_ENV_EXTRAWHITE"], s)
self.assertIn(env["BB_ENV_PASSTHROUGH_ADDITIONS"], s)

s = self.assertPyrexContainerShellCommand(
"echo $TEST_BB_EXTRA", env=env, quiet_init=True, capture=True
Expand Down Expand Up @@ -1080,7 +1080,7 @@ def test_top_dir(self):
def test_env_capture(self):
extra_white = set(
self.assertPyrexHostCommand(
"echo $BB_ENV_EXTRAWHITE", quiet_init=True, capture=True
"echo $BB_ENV_PASSTHROUGH_ADDITIONS", quiet_init=True, capture=True
).split()
)

Expand All @@ -1094,9 +1094,9 @@ def test_env_capture(self):
)
self.assertEqual(builddir, self.build_dir)

def test_bb_env_extrawhite_parse(self):
def test_BB_ENV_PASSTHROUGH_ADDITIONS_parse(self):
env = os.environ.copy()
env["BB_ENV_EXTRAWHITE"] = "TEST_BB_EXTRA"
env["BB_ENV_PASSTHROUGH_ADDITIONS"] = "TEST_BB_EXTRA"
env["TEST_BB_EXTRA"] = "foo"

s = self.assertPyrexHostCommand(
Expand Down
2 changes: 1 addition & 1 deletion image/capture.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ cat > "$PYREX_CAPTURE_DEST" <<HEREDOC
"user" : {
"cwd": "$PWD",
"export": {
"BB_ENV_EXTRAWHITE": "$BB_ENV_EXTRAWHITE",
"BB_ENV_PASSTHROUGH_ADDITIONS": "$BB_ENV_PASSTHROUGH_ADDITIONS",
"BUILDDIR": "$BUILDDIR"
}
},
Expand Down
8 changes: 4 additions & 4 deletions pyrex.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -551,10 +551,10 @@ def prep_container(
container_envvars.extend(config["run"]["envvars"].split())
container_envvars.extend(extra_envvars)

# Pass along BB_ENV_EXTRAWHITE and anything it has whitelisted
if "BB_ENV_EXTRAWHITE" in os.environ:
engine_args.extend(["-e", "BB_ENV_EXTRAWHITE"])
container_envvars.extend(os.environ["BB_ENV_EXTRAWHITE"].split())
# Pass along BB_ENV_PASSTHROUGH_ADDITIONS and anything it has whitelisted
if "BB_ENV_PASSTHROUGH_ADDITIONS" in os.environ:
engine_args.extend(["-e", "BB_ENV_PASSTHROUGH_ADDITIONS"])
container_envvars.extend(os.environ["BB_ENV_PASSTHROUGH_ADDITIONS"].split())

# Pass environment variables. If a variable passed with an argument
# "-e VAR" is not set in the parent environment, podman passes an
Expand Down