Skip to content

Commit d1a0543

Browse files
Merge pull request #30182 from ardaguclu/ocpbugs-56691-2
OCPBUGS-56691: Pass volume-percentage to 100 in must-gather executions
2 parents 63e2fb9 + c48fd25 commit d1a0543

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

test/extended/cli/mustgather.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ var _ = g.Describe("[sig-cli] oc adm must-gather", func() {
4646
tempDir, err := ioutil.TempDir("", "test.oc-adm-must-gather.")
4747
o.Expect(err).NotTo(o.HaveOccurred())
4848
defer os.RemoveAll(tempDir)
49-
o.Expect(oc.Run("adm", "must-gather").Args("--dest-dir", tempDir).Execute()).To(o.Succeed())
49+
o.Expect(oc.Run("adm", "must-gather").Args("--dest-dir", tempDir, "--volume-percentage=100").Execute()).To(o.Succeed())
5050

5151
pluginOutputDir := GetPluginOutputDir(tempDir)
5252

@@ -113,6 +113,7 @@ var _ = g.Describe("[sig-cli] oc adm must-gather", func() {
113113
defer os.RemoveAll(tempDir)
114114
args := []string{
115115
"--dest-dir", tempDir,
116+
"--volume-percentage=100",
116117
"--source-dir", "/artifacts",
117118
"--",
118119
"/bin/bash", "-c",
@@ -169,6 +170,7 @@ var _ = g.Describe("[sig-cli] oc adm must-gather", func() {
169170

170171
args := []string{
171172
"--dest-dir", tempDir,
173+
"--volume-percentage=100",
172174
"--",
173175
"/usr/bin/gather_audit_logs",
174176
}
@@ -299,6 +301,7 @@ var _ = g.Describe("[sig-cli] oc adm must-gather", func() {
299301

300302
args := []string{
301303
"--dest-dir", tempDir,
304+
"--volume-percentage=100",
302305
"--",
303306
"/usr/bin/gather_audit_logs",
304307
}

test/extended/util/compat_otp/must-gather.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ func ArchiveMustGatherFile(oc *exutil.CLI, addExtraContent func(*exutil.CLI, str
145145
tmpMustGatherTarFile := path.Join(tmpMustGatherDir, mustGatherFileName)
146146
tmpMustGatherGenDir := path.Join(tmpMustGatherDir, tmpSubdir)
147147

148-
mgStd, mgErr := oc.AsAdmin().WithoutNamespace().Run("adm").Args("must-gather", "--dest-dir", tmpMustGatherGenDir).Output()
148+
mgStd, mgErr := oc.AsAdmin().WithoutNamespace().Run("adm").Args("must-gather", "--dest-dir", tmpMustGatherGenDir, "--volume-percentage=100").Output()
149149
if mgErr != nil {
150150
logger.Errorf("Error creating must-gather file: %s\n\n%s", mgErr, mgStd)
151151
// We don't return the error here, we want to always compress the directory in case it exists

0 commit comments

Comments
 (0)