Skip to content

Commit

Permalink
Add kn-event
Browse files Browse the repository at this point in the history
  • Loading branch information
cardil committed May 9, 2024
1 parent b055cc3 commit 48c7253
Show file tree
Hide file tree
Showing 4 changed files with 70 additions and 22 deletions.
26 changes: 15 additions & 11 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,29 +2,33 @@
# replacing reference images via env variable.
include pkg/project/testdata/env

generate-ci: clean generate-eventing-ci generate-serving-ci
.PHONY: generate-ci
all: eventing serving operator client
.PHONY: all

generate-ci-no-clean: generate-eventing-ci generate-serving-ci generate-serverless-operator-ci
.PHONY: generate-ci-no-clean

generate-eventing-ci:
eventing:
go run github.com/openshift-knative/hack/cmd/prowgen --config config/backstage-plugins.yaml $(ARGS)
go run github.com/openshift-knative/hack/cmd/prowgen --config config/eventing.yaml $(ARGS)
go run github.com/openshift-knative/hack/cmd/prowgen --config config/eventing-istio.yaml $(ARGS)
go run github.com/openshift-knative/hack/cmd/prowgen --config config/eventing-kafka-broker.yaml $(ARGS)
go run github.com/openshift-knative/hack/cmd/prowgen --config config/eventing-hyperfoil-benchmark.yaml $(ARGS)
.PHONY: generate-eventing-ci
.PHONY: eventing

generate-serving-ci:
serving:
go run github.com/openshift-knative/hack/cmd/prowgen --config config/serving.yaml $(ARGS)
go run github.com/openshift-knative/hack/cmd/prowgen --config config/serving-net-istio.yaml $(ARGS)
go run github.com/openshift-knative/hack/cmd/prowgen --config config/serving-net-kourier.yaml $(ARGS)
.PHONY: generate-serving-ci
.PHONY: serving

generate-serverless-operator-ci:
operator:
go run github.com/openshift-knative/hack/cmd/prowgen --config config/serverless-operator.yaml $(ARGS)
.PHONY: generate-serverless-operator-ci
.PHONY: operator

client: kn-event
.PHONY: client

kn-event:
go run github.com/openshift-knative/hack/cmd/prowgen --config config/kn-event.yaml $(ARGS)
.PHONY: kn-event

discover-branches:
go run github.com/openshift-knative/hack/cmd/discover $(ARGS)
Expand Down
38 changes: 38 additions & 0 deletions config/kn-event.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
---
config:
branches:
release-1.8:
openShiftVersions:
- version: "4.12"
skipCron: true
onDemand: true
release-1.10:
openShiftVersions:
- skipCron: true
version: "4.15"
release-1.11:
openShiftVersions:
- skipCron: true
version: "4.15"
- onDemand: true
skipCron: true
version: "4.12"
release-1.12:
openShiftVersions:
- version: "4.15"
- onDemand: true
version: "4.12"
release-1.13:
openShiftVersions:
- version: "4.15"
- onDemand: true
version: "4.12"
repositories:
- dockerfiles: {}
ignoreConfigs: {}
imagePrefix: client-plugin-event
org: openshift-knative
promotion:
namespace: knative
repo: kn-plugin-event
slackChannel: '#knative-client'
27 changes: 16 additions & 11 deletions pkg/prowgen/prowgen.go
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ func Main() {
outConfig := flag.String("output", filepath.Join(openShiftRelease.Org, openShiftRelease.Repo, "ci-operator", "config"), "Specify repositories config")
remote := flag.String("remote", "", "openshift/release remote fork (example: git@github.com:pierDipi/release.git)")
branch := flag.String("branch", "sync-serverless-ci", "Branch for remote fork")
push := flag.Bool("push", true, "Push changes to remote fork")
build := flag.Bool("build", true, "Run the openshift/release generator")
flag.Parse()

log.Println(*inputConfig, *outConfig)
Expand Down Expand Up @@ -116,18 +118,21 @@ func Main() {
if err := repositoriesGenerateConfigs.Wait(); err != nil {
log.Fatalln("Failed waiting for repositories generator", err)
}

if err := RunOpenShiftReleaseGenerator(ctx, openShiftRelease); err != nil {
log.Fatalln("Failed to run openshift/release generator:", err)
}
if err := runJobConfigInjectors(inConfig, openShiftRelease); err != nil {
log.Fatalln("Failed to inject Slack reporter", err)
}
if err := RunOpenShiftReleaseGenerator(ctx, openShiftRelease); err != nil {
log.Fatalln("Failed to run openshift/release generator after injecting Slack reporter", err)
if *build {
if err := RunOpenShiftReleaseGenerator(ctx, openShiftRelease); err != nil {
log.Fatalln("Failed to run openshift/release generator:", err)
}
if err := runJobConfigInjectors(inConfig, openShiftRelease); err != nil {
log.Fatalln("Failed to inject Slack reporter", err)
}
if err := RunOpenShiftReleaseGenerator(ctx, openShiftRelease); err != nil {
log.Fatalln("Failed to run openshift/release generator after injecting Slack reporter", err)
}
}
if err := PushBranch(ctx, openShiftRelease, remote, *branch, *inputConfig); err != nil {
log.Fatalln("Failed to push branch to openshift/release fork", *remote, err)
if *push {
if err := PushBranch(ctx, openShiftRelease, remote, *branch, *inputConfig); err != nil {
log.Fatalln("Failed to push branch to openshift/release fork", *remote, err)
}
}
}

Expand Down
1 change: 1 addition & 0 deletions pkg/prowgen/prowgen_images_discovery.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ var (
"openshift/ci-operator/knative-images.*",
"openshift/ci-operator/knative-test-images.*",
"openshift/ci-operator/static-images.*",
"openshift/ci-operator/.*images?.*",
}
)

Expand Down

0 comments on commit 48c7253

Please sign in to comment.