Skip to content

Commit 0794878

Browse files
twangboydwoz
twangboy
authored and
dwoz
committed
Add some debugging for macOS failures
1 parent 1168334 commit 0794878

File tree

2 files changed

+68
-15
lines changed

2 files changed

+68
-15
lines changed

‎pkg/macos/pkg-scripts/postinstall

Lines changed: 65 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -86,55 +86,107 @@ fi
8686

8787
log "Symlink: Creating symlinks for salt..."
8888
ln -sf "$INSTALL_DIR/salt" "$SBIN_DIR/salt"
89-
log "Symlink: Created Successfully"
89+
if [ -f "$SBIN_DIR/salt" ]; then
90+
log "Symlink: Created Successfully"
91+
else
92+
log "Symlink: Failed to create symlink"
93+
fi
9094

9195
log "Symlink: Creating symlinks for salt-api..."
9296
ln -sf "$INSTALL_DIR/salt-api" "$SBIN_DIR/salt-api"
93-
log "Symlink: Created Successfully"
97+
if [ -f "$SBIN_DIR/salt-api" ]; then
98+
log "Symlink: Created Successfully"
99+
else
100+
log "Symlink: Failed to create symlink"
101+
fi
94102

95103
log "Symlink: Creating symlinks for salt-call..."
96104
ln -sf "$INSTALL_DIR/salt-call" "$SBIN_DIR/salt-call"
97-
log "Symlink: Created Successfully"
105+
if [ -f "$SBIN_DIR/salt-call" ]; then
106+
log "Symlink: Created Successfully"
107+
else
108+
log "Symlink: Failed to create symlink"
109+
fi
98110

99111
log "Symlink: Creating symlinks for salt-cloud..."
100112
ln -sf "$INSTALL_DIR/salt-cloud" "$SBIN_DIR/salt-cloud"
101-
log "Symlink: Created Successfully"
113+
if [ -f "$SBIN_DIR/salt-cloud" ]; then
114+
log "Symlink: Created Successfully"
115+
else
116+
log "Symlink: Failed to create symlink"
117+
fi
102118

103119
log "Symlink: Creating symlinks for salt-cp..."
104120
ln -sf "$INSTALL_DIR/salt-cp" "$SBIN_DIR/salt-cp"
105-
log "Symlink: Created Successfully"
121+
if [ -f "$SBIN_DIR/salt-cp" ]; then
122+
log "Symlink: Created Successfully"
123+
else
124+
log "Symlink: Failed to create symlink"
125+
fi
106126

107127
log "Symlink: Creating symlinks for salt-key..."
108128
ln -sf "$INSTALL_DIR/salt-key" "$SBIN_DIR/salt-key"
109-
log "Symlink: Created Successfully"
129+
if [ -f "$SBIN_DIR/salt-key" ]; then
130+
log "Symlink: Created Successfully"
131+
else
132+
log "Symlink: Failed to create symlink"
133+
fi
110134

111135
log "Symlink: Creating symlinks for salt-master..."
112136
ln -sf "$INSTALL_DIR/salt-master" "$SBIN_DIR/salt-master"
113-
log "Symlink: Created Successfully"
137+
if [ -f "$SBIN_DIR/salt-master" ]; then
138+
log "Symlink: Created Successfully"
139+
else
140+
log "Symlink: Failed to create symlink"
141+
fi
114142

115143
log "Symlink: Creating symlinks for salt-minion..."
116144
ln -sf "$INSTALL_DIR/salt-minion" "$SBIN_DIR/salt-minion"
117-
log "Symlink: Created Successfully"
145+
if [ -f "$SBIN_DIR/salt-minion" ]; then
146+
log "Symlink: Created Successfully"
147+
else
148+
log "Symlink: Failed to create symlink"
149+
fi
118150

119151
log "Symlink: Creating symlinks for salt-proxy..."
120152
ln -sf "$INSTALL_DIR/salt-proxy" "$SBIN_DIR/salt-proxy"
121-
log "Symlink: Created Successfully"
153+
if [ -f "$SBIN_DIR/salt-proxy" ]; then
154+
log "Symlink: Created Successfully"
155+
else
156+
log "Symlink: Failed to create symlink"
157+
fi
122158

123159
log "Symlink: Creating symlinks for salt-run..."
124160
ln -sf "$INSTALL_DIR/salt-run" "$SBIN_DIR/salt-run"
125-
log "Symlink: Created Successfully"
161+
if [ -f "$SBIN_DIR/salt-run" ]; then
162+
log "Symlink: Created Successfully"
163+
else
164+
log "Symlink: Failed to create symlink"
165+
fi
126166

127167
log "Symlink: Creating symlinks for spm..."
128168
ln -sf "$INSTALL_DIR/spm" "$SBIN_DIR/spm"
129-
log "Symlink: Created Successfully"
169+
if [ -f "$SBIN_DIR/salt-spm" ]; then
170+
log "Symlink: Created Successfully"
171+
else
172+
log "Symlink: Failed to create symlink"
173+
fi
130174

131175
log "Symlink: Creating symlinks for salt-ssh..."
132176
ln -sf "$INSTALL_DIR/salt-ssh" "$SBIN_DIR/salt-ssh"
133-
log "Symlink: Created Successfully"
177+
if [ -f "$SBIN_DIR/salt-ssh" ]; then
178+
log "Symlink: Created Successfully"
179+
else
180+
log "Symlink: Failed to create symlink"
181+
fi
134182

135183
log "Symlink: Creating symlinks for salt-syndic..."
136184
ln -sf "$INSTALL_DIR/salt-syndic" "$SBIN_DIR/salt-syndic"
137-
log "Symlink: Created Successfully"
185+
if [ -f "$SBIN_DIR/salt-syndic" ]; then
186+
log "Symlink: Created Successfully"
187+
else
188+
log "Symlink: Failed to create symlink"
189+
fi
138190

139191
#-------------------------------------------------------------------------------
140192
# Add salt to paths.d

‎tests/pytests/pkg/integration/test_version.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ def test_salt_version(version, install_salt):
2929
actual.append(actual_ver[0])
3030
actual.append(actual_ver_salt_stripped)
3131
else:
32-
pytest.skip("Not testing a non-release build artifact, do not run")
32+
pytest.skip("We don't run this test on release builds")
3333

3434
expected = ["salt", version]
3535
assert actual == expected
@@ -128,7 +128,6 @@ def test_compare_versions(binary, install_salt):
128128
@pytest.mark.parametrize(
129129
"symlink",
130130
[
131-
# We can't create a salt symlink because there is a salt directory
132131
"salt",
133132
"salt-api",
134133
"salt-call",
@@ -149,6 +148,8 @@ def test_symlinks_created(version, symlink, install_salt):
149148
Test symlinks created
150149
"""
151150
ret = install_salt.proc.run(pathlib.Path("/usr/local/sbin") / symlink, "--version")
151+
install_log_file = pathlib.Path("/tmp") / "postinstall.txt"
152+
install_log_content = install_log_file.read_text()
152153
ret.stdout.matcher.fnmatch_lines([f"*{version}*"])
153154

154155

0 commit comments

Comments
 (0)