Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 0 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ require (
github.com/go-ozzo/ozzo-validation v0.0.0-00010101000000-000000000000 // indirect
github.com/golang/protobuf v1.4.2
github.com/google/go-cmp v0.4.0
github.com/google/go-github v17.0.0+incompatible
github.com/google/go-querystring v0.0.0-00010101000000-000000000000 // indirect
github.com/google/uuid v1.1.1
github.com/gorilla/context v0.0.0-00010101000000-000000000000 // indirect
github.com/heketi/tests v0.0.0-00010101000000-000000000000 // indirect
Expand Down
4 changes: 0 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -252,10 +252,6 @@ github.com/google/cadvisor v0.37.0 h1:t3txV4zNZZGTuwuA/Onm3HToPhg16GjigAHZHEVIz+
github.com/google/cadvisor v0.37.0/go.mod h1:OhDE+goNVel0eGY8mR7Ifq1QUI1in5vJBIgIpcajK/I=
github.com/google/go-cmp v0.3.0 h1:crn/baboCvb5fXaQ0IJ1SGTsTVrWpDsCWC8EGETZijY=
github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
github.com/google/go-github v17.0.0+incompatible h1:N0LgJ1j65A7kfXrZnUDaYCs/Sf4rEjNlfyDHW9dolSY=
github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ=
github.com/google/go-querystring v1.0.0 h1:Xkwi/a1rcvNg1PPYe5vI8GbeBY/jrVuDX5ASuANWTrk=
github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
github.com/google/gofuzz v1.1.0 h1:Hsa8mG0dQ46ij8Sl2AYJDUv1oA9/d6Vk+3LG99Oe02g=
github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
Expand Down
41 changes: 0 additions & 41 deletions test/extended/operators/olm.go
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@
package operators

import (
"context"
"fmt"
"path/filepath"
"strings"
"time"

"github.com/google/go-github/github"
g "github.com/onsi/ginkgo"
o "github.com/onsi/gomega"

exutil "github.com/openshift/origin/test/extended/util"
e2e "k8s.io/kubernetes/test/e2e/framework"
)
Expand Down Expand Up @@ -109,44 +106,6 @@ var _ = g.Describe("[sig-operator] OLM should", func() {
}
})

// OCP-20981, [BZ 1626434]The olm/catalog binary should output the exact version info
// author: jiazha@redhat.com
g.It("[Serial] olm version should contain the source commit id", func() {
sameCommit := ""
subPods := []string{"catalog-operator", "olm-operator", "packageserver"}

for _, v := range subPods {
podName, err := oc.AsAdmin().Run("get").Args("-n", "openshift-operator-lifecycle-manager", "pods", "-l", fmt.Sprintf("app=%s", v), "-o=jsonpath={.items[0].metadata.name}").Output()
o.Expect(err).NotTo(o.HaveOccurred())
e2e.Logf("get pod name:%s", podName)

g.By(fmt.Sprintf("get olm version from the %s pod", v))
oc.SetNamespace("openshift-operator-lifecycle-manager")
commands := []string{"exec", podName, "--", "olm", "--version"}
olmVersion, err := oc.AsAdmin().Run(commands...).Args().Output()
o.Expect(err).NotTo(o.HaveOccurred())
idSlice := strings.Split(olmVersion, ":")
gitCommitID := strings.TrimSpace(idSlice[len(idSlice)-1])
e2e.Logf("olm source git commit ID:%s", gitCommitID)
if len(gitCommitID) != 40 {
e2e.Failf(fmt.Sprintf("the length of the git commit id is %d, != 40", len(gitCommitID)))
}

if sameCommit == "" {
sameCommit = gitCommitID
g.By("checking this commitID in the operator-lifecycle-manager repo")
client := github.NewClient(nil)
_, _, err := client.Git.GetCommit(context.Background(), "operator-framework", "operator-lifecycle-manager", gitCommitID)
if err != nil {
e2e.Failf("Git.GetCommit returned error: %v", err)
}
o.Expect(err).NotTo(o.HaveOccurred())

} else if gitCommitID != sameCommit {
e2e.Failf("These commitIDs inconformity!!!")
}
}
})
})

// This context will cover test case: OCP-23440, author: jiazha@redhat.com
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

174 changes: 0 additions & 174 deletions vendor/github.com/google/go-github/AUTHORS

This file was deleted.

27 changes: 0 additions & 27 deletions vendor/github.com/google/go-github/LICENSE

This file was deleted.

69 changes: 0 additions & 69 deletions vendor/github.com/google/go-github/github/activity.go

This file was deleted.

Loading