Skip to content

Commit 98c39e1

Browse files
committed
debugging
1 parent 972df51 commit 98c39e1

File tree

3 files changed

+42
-37
lines changed

3 files changed

+42
-37
lines changed

.travis.yml

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -103,53 +103,53 @@ jobs:
103103

104104
## Project check stage jobs ##
105105

106-
# Run the sanity tests
107-
- stage: check
108-
name: Sanity Tests
109-
script:
110-
- make test-sanity
111-
112-
# Run website checks
113-
- name: Doc Checks
114-
script:
115-
- make test-links
106+
# # Run the sanity tests
107+
# - stage: check
108+
# name: Sanity Tests
109+
# script:
110+
# - make test-sanity
111+
#
112+
# # Run website checks
113+
# - name: Doc Checks
114+
# script:
115+
# - make test-links
116116

117117
## Operator test stage jobs ##
118118

119-
# Build and test ansible and test ansible using molecule
120-
- stage: test
121-
<<: *test
122-
name: Ansible on Kubernetes
123-
before_script:
124-
- pip3 install --upgrade setuptools pip
125-
- pip install --user ansible
126-
script:
127-
- make test-e2e-ansible
128-
- make test-e2e-ansible-molecule
119+
# # Build and test ansible and test ansible using molecule
120+
# - stage: test
121+
# <<: *test
122+
# name: Ansible on Kubernetes
123+
# before_script:
124+
# - pip3 install --upgrade setuptools pip
125+
# - pip install --user ansible
126+
# script:
127+
# - make test-e2e-ansible
128+
# - make test-e2e-ansible-molecule
129129

130130
# Test subcommands
131131
- <<: *test
132132
name: Subcommands and Integration on Kubernetes
133133
script:
134-
- make test-subcommand
134+
# - make test-subcommand
135135
- make test-integration
136136
- make image-build-custom-scorecard-tests
137137

138-
# Build and test go
139-
- <<: *test
140-
name: Go on Kubernetes
141-
before_script:
142-
- (cd / && go get github.com/mattn/goveralls)
143-
script:
144-
- make test-unit
145-
- make test-e2e-go
146-
after_success:
147-
- $GOPATH/bin/goveralls -service=travis-ci -coverprofile=coverage.out -repotoken=$COVERALLS_TOKEN
148-
149-
# Build and test helm
150-
- <<: *test
151-
name: Helm on Kubernetes
152-
script: make test-e2e-helm
138+
# # Build and test go
139+
# - <<: *test
140+
# name: Go on Kubernetes
141+
# before_script:
142+
# - (cd / && go get github.com/mattn/goveralls)
143+
# script:
144+
# - make test-unit
145+
# - make test-e2e-go
146+
# after_success:
147+
# - $GOPATH/bin/goveralls -service=travis-ci -coverprofile=coverage.out -repotoken=$COVERALLS_TOKEN
148+
#
149+
# # Build and test helm
150+
# - <<: *test
151+
# name: Helm on Kubernetes
152+
# script: make test-e2e-helm
153153

154154
## Image deploy/push stage jobs ##
155155

internal/olm/client/client.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import (
2626
"time"
2727

2828
"github.com/blang/semver"
29+
v1 "github.com/operator-framework/api/pkg/operators/v1"
2930
olmapiv1alpha1 "github.com/operator-framework/api/pkg/operators/v1alpha1"
3031
log "github.com/sirupsen/logrus"
3132
appsv1 "k8s.io/api/apps/v1"
@@ -214,6 +215,10 @@ func (c Client) DoCSVWait(ctx context.Context, key types.NamespacedName) error {
214215

215216
switch curPhase {
216217
case olmapiv1alpha1.CSVPhaseFailed:
218+
var ogl v1.OperatorGroupList
219+
_ = c.KubeClient.List(ctx, &ogl, client.InNamespace(csv.GetNamespace()))
220+
log.Printf(" Found Operator Groups: %#v\n", ogl.Items)
221+
log.Printf(" CSV Contents are: %#v\n", csv)
217222
return false, fmt.Errorf("csv failed: reason: %q, message: %q", csv.Status.Reason, csv.Status.Message)
218223
case olmapiv1alpha1.CSVPhaseSucceeded:
219224
return true, nil

test/integration/operator_olm_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ func TestOLMIntegration(t *testing.T) {
5454
testImageTag = image
5555
}
5656

57-
t.Run("PackageManifestsBasic", PackageManifestsBasic)
5857
t.Run("PackageManifestsOwnNamespace", PackageManifestsOwnNamespace)
58+
t.Run("PackageManifestsBasic", PackageManifestsBasic)
5959
t.Run("PackageManifestsMultiplePackages", PackageManifestsMultiplePackages)
6060
}
6161

0 commit comments

Comments
 (0)