mirror of
https://github.com/ossf/scorecard.git
synced 2024-10-26 10:28:10 +03:00
Fix - Output path for the test runs
This commit is contained in:
naveen
Naveen
parent
a7174d8ad7
commit
6f2a0f43f4
42
.github/workflows/integration.yml
vendored
42
.github/workflows/integration.yml
vendored
@ -7,6 +7,7 @@ on:
|
||||
name: Integration tests
|
||||
env:
|
||||
IMAGE_NAME: scorecard
|
||||
OUTPUT_PATH: output
|
||||
jobs:
|
||||
integration-trusted:
|
||||
runs-on: ubuntu-latest
|
||||
@ -58,40 +59,28 @@ jobs:
|
||||
- name: Use gcloud CLI
|
||||
run: gcloud info
|
||||
|
||||
- name: Prepare test env
|
||||
run: |
|
||||
go get github.com/onsi/ginkgo/ginkgo@v1.14.2
|
||||
go mod download
|
||||
mkdir -p $OUTPUT_PATH
|
||||
|
||||
- name: Run E2E with Disk Cache
|
||||
env:
|
||||
GITHUB_AUTH_TOKEN: ${{ secrets.GH_AUTH_TOKEN }}
|
||||
run: |
|
||||
if [[ ! -v GITHUB_AUTH_TOKEN ]]; then
|
||||
echo "GITHUB_AUTH_TOKEN is not set, skip test"
|
||||
exit 1
|
||||
elif [[ -z "$GITHUB_AUTH_TOKEN" ]]; then
|
||||
echo "GITHUB_AUTH_TOKEN is set to the empty string, skip test"
|
||||
exit 1
|
||||
else
|
||||
go get github.com/onsi/ginkgo/ginkgo@v1.14.2
|
||||
make ci-e2e
|
||||
sleep 1m # this required to avoid 403 from GitHub API's
|
||||
fi
|
||||
|
||||
- name: Test Blob cache
|
||||
env:
|
||||
GITHUB_AUTH_TOKEN: ${{ secrets.GH_AUTH_TOKEN }}
|
||||
USE_BLOB_CACHE: true
|
||||
BLOB_URL: ${{secrets.BUCKET_URL}}
|
||||
run: |
|
||||
if [[ ! -v GITHUB_AUTH_TOKEN ]]; then
|
||||
echo "GITHUB_AUTH_TOKEN is not set, skip test"
|
||||
exit 1
|
||||
elif [[ -z "$GITHUB_AUTH_TOKEN" ]]; then
|
||||
echo "GITHUB_AUTH_TOKEN is set to the empty string, skip test"
|
||||
exit 1
|
||||
else
|
||||
go get github.com/onsi/ginkgo/ginkgo@v1.14.2
|
||||
go mod download
|
||||
mkdir -p bin
|
||||
./scorecard --repo=https://github.com/ossf/scorecard --show-details --metadata=openssf --format json > ./bin/results.json
|
||||
./scorecard --repo=https://github.com/ossf/scorecard --show-details --metadata=openssf --format json > ./$OUTPUT_PATH/results.json
|
||||
ginkgo --focus="E2E TEST:executable|E2E TEST:blob" ./...
|
||||
fi
|
||||
|
||||
- name: Build docker image
|
||||
run: docker build . --file Dockerfile --tag $IMAGE_NAME
|
||||
@ -100,19 +89,8 @@ jobs:
|
||||
env:
|
||||
GITHUB_AUTH_TOKEN: ${{ secrets.GH_AUTH_TOKEN }}
|
||||
run: |
|
||||
if [[ ! -v GITHUB_AUTH_TOKEN ]]; then
|
||||
echo "GITHUB_AUTH_TOKEN is not set, skip test"
|
||||
exit 1
|
||||
elif [[ -z "$GITHUB_AUTH_TOKEN" ]]; then
|
||||
echo "GITHUB_AUTH_TOKEN is set to the empty string, skip test"
|
||||
exit 1
|
||||
else
|
||||
go get github.com/onsi/ginkgo/ginkgo@v1.14.2
|
||||
go mod download
|
||||
mkdir -p bin
|
||||
docker run -e GITHUB_AUTH_TOKEN=$GITHUB_AUTH_TOKEN $IMAGE_NAME --show-details --repo=https://github.com/ossf/scorecard --metadata=openssf --format json > ./bin/results.json
|
||||
docker run -e GITHUB_AUTH_TOKEN=$GITHUB_AUTH_TOKEN $IMAGE_NAME --show-details --repo=https://github.com/ossf/scorecard --metadata=openssf --format json > ./$OUTPUT_PATH/results.json
|
||||
ginkgo -p -v --focus="E2E TEST:executable" ./...
|
||||
fi
|
||||
|
||||
- name: find comment
|
||||
if: ${{ always() }}
|
||||
|
||||
1
.gitignore
vendored
1
.gitignore
vendored
@ -25,3 +25,4 @@ results.json
|
||||
bin
|
||||
|
||||
cache
|
||||
output
|
||||
|
||||
5
Makefile
5
Makefile
@ -2,6 +2,7 @@ SHELL := /bin/bash
|
||||
GOBIN ?= $(GOPATH)/bin
|
||||
GINKGO ?= $(GOBIN)/ginkgo
|
||||
IMAGE_NAME = scorecard
|
||||
OUTPUT = output
|
||||
|
||||
.PHONY: help
|
||||
help: ## Display this help
|
||||
@ -61,9 +62,9 @@ ci-e2e: ## Runs ci e2e tests
|
||||
# export GITHUB_AUTH_TOKEN with personal access token to run the e2e
|
||||
ci-e2e: build check-env
|
||||
$(call ndef, GITHUB_AUTH_TOKEN)
|
||||
mkdir -p bin
|
||||
mkdir -p $(OUTPUT)
|
||||
mkdir -p cache
|
||||
USE_DISK_CACHE=1 DISK_CACHE_PATH="./cache" ./scorecard --repo=https://github.com/ossf/scorecard --show-details --metadata=openssf --format json > ./bin/results.json
|
||||
DISK_CACHE_PATH="./cache" ./scorecard --repo=https://github.com/ossf/scorecard --show-details --metadata=openssf --format json > ./$(OUTPUT)/results.json
|
||||
@sleep 30
|
||||
ginkgo -p -v -cover --skip="E2E TEST:blob" ./...
|
||||
|
||||
|
||||
@ -23,8 +23,7 @@ type scorecard struct {
|
||||
var _ = Describe("E2E TEST:executable", func() {
|
||||
Context("E2E TEST:Validating executable test", func() {
|
||||
It("Should return valid test results for scorecard", func() {
|
||||
file, err := ioutil.ReadFile("../bin/results.json")
|
||||
|
||||
file, err := ioutil.ReadFile("../output/results.json")
|
||||
Expect(err).Should(BeNil())
|
||||
|
||||
data := scorecard{}
|
||||
|
||||
6
go.sum
6
go.sum
@ -200,7 +200,6 @@ github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw
|
||||
github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
|
||||
github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
|
||||
github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
|
||||
github.com/google/go-cmp v0.5.1 h1:JFrFEBb2xKufg6XkJsJr+WbKb4FQlURi5RUcBveYu9k=
|
||||
github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
|
||||
github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
|
||||
github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M=
|
||||
@ -393,7 +392,6 @@ github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoH
|
||||
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
|
||||
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
|
||||
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
|
||||
github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4=
|
||||
github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
|
||||
github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
|
||||
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
||||
@ -436,7 +434,6 @@ golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACk
|
||||
golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
|
||||
golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
|
||||
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
|
||||
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI=
|
||||
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
|
||||
golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
|
||||
golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
|
||||
@ -472,7 +469,6 @@ golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
|
||||
golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
|
||||
golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
|
||||
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
|
||||
golang.org/x/mod v0.3.0 h1:RM4zey1++hCTbCVQfnWeKs9/IEsaBLA8vTkd0WVtmH4=
|
||||
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
|
||||
golang.org/x/mod v0.4.0 h1:8pl+sMODzuvGJkmj2W4kZihvVb5mKm8pB/X44PIQHv8=
|
||||
golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
|
||||
@ -522,7 +518,6 @@ golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4Iltr
|
||||
golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
|
||||
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
|
||||
golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
|
||||
golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58 h1:Mj83v+wSRNEar42a/MQgxk9X42TdEmrOl9i+y8WbxLo=
|
||||
golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
|
||||
golang.org/x/oauth2 v0.0.0-20201203001011-0b49973bad19 h1:ZD+2Sd/BnevwJp8PSli8WgGAGzb9IZtxBsv1iZMYeEA=
|
||||
golang.org/x/oauth2 v0.0.0-20201203001011-0b49973bad19/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
|
||||
@ -584,7 +579,6 @@ golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fq
|
||||
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
||||
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
||||
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
|
||||
golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k=
|
||||
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
||||
golang.org/x/text v0.3.4 h1:0YWbFKbhXG/wIiuHDSKpS0Iy7FSA+u45VtBMfQcFTTc=
|
||||
golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
||||
|
||||
Loading…
Reference in New Issue
Block a user