Skip to content

Commit 252914c

Browse files
authored
chore: buildpack integ tests upload logs from container (#119)
1 parent 1975792 commit 252914c

File tree

3 files changed

+19
-11
lines changed

3 files changed

+19
-11
lines changed

.github/workflows/buildpack-integration-test.yml

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -151,11 +151,18 @@ jobs:
151151
if: ${{ matrix.builder-source }}
152152
run: |
153153
client \
154-
-type=${{ matrix.type }} \
155-
-builder-source=${{ matrix.builder-source }} \
156-
-builder-target=${{ matrix.builder-target }} \
157-
-builder-runtime=${{ inputs.builder-runtime }} \
158-
-builder-tag=${{ inputs.builder-tag }} \
159-
-start-delay=${{ inputs.start-delay }} \
160-
-output-file=${{ inputs.output-file }} \
161-
-validate-mapping=false
154+
-type=${{ matrix.type }} \
155+
-builder-source=${{ matrix.builder-source }} \
156+
-builder-target=${{ matrix.builder-target }} \
157+
-builder-runtime=${{ inputs.builder-runtime }} \
158+
-builder-tag=${{ inputs.builder-tag }} \
159+
-start-delay=${{ inputs.start-delay }} \
160+
-output-file=${{ inputs.output-file }} \
161+
-validate-mapping=false
162+
- name: 'Upload Artifact'
163+
uses: actions/upload-artifact@v3
164+
if: always()
165+
with:
166+
name: ${{ matrix.type }}_buildpack_integ_logs
167+
path: /tmp/ff_*
168+
retention-days: 5

client/buildpacks.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,13 +144,14 @@ func (b *buildpacksFunctionServer) run() (func(), error) {
144144
if err := b.logs(); err != nil {
145145
log.Fatalf("getting container logs: %v", err)
146146
}
147+
log.Printf("Wrote logs to %v and %v.", b.stdoutFile, b.stderrFile)
147148
if err := cmd.Process.Kill(); err != nil {
148149
log.Fatalf("failed to kill process: %v", err)
149150
}
150151
if err := b.killContainer(); err != nil {
151152
log.Fatalf("failed to kill container: %v", err)
152153
}
153-
log.Printf("Framework server shut down. Wrote logs to %v and %v.", b.stdoutFile, b.stderrFile)
154+
log.Print("Framework server shut down.")
154155
}, nil
155156
}
156157

client/start.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ import (
2828
)
2929

3030
var (
31-
defaultStdoutFile = path.Join(os.TempDir(), "serverlog_stdout.txt")
32-
defaultStderrFile = path.Join(os.TempDir(), "serverlog_stderr.txt")
31+
defaultStdoutFile = path.Join(os.TempDir(), "/ff_serverlog_stdout.txt")
32+
defaultStderrFile = path.Join(os.TempDir(), "/ff_serverlog_stderr.txt")
3333
)
3434

3535
type functionServer interface {

0 commit comments

Comments
 (0)