Skip to content

Commit

Permalink
Release Prep
Browse files Browse the repository at this point in the history
  • Loading branch information
Aneesh-M-Bhat authored and openshift-merge-bot[bot] committed Mar 22, 2024
1 parent d58f18b commit c9c5c2f
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 11 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
/.git
/.vscode/
/*.tgz
/.bin
2 changes: 1 addition & 1 deletion Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
apiVersion: v2
name: task-maven
version: 0.1.0
version: 0.2.0
description: todo
type: application
6 changes: 4 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,9 @@ BATS_FLAGS ?= --print-output-on-failure --show-output-of-passing-tests --verbose
E2E_TESTS ?= ./test/e2e/*.bats

E2E_PVC ?= test/e2e/resources/pvc-maven.yaml
E2E_SECRET ?= test/e2e/resources/secret-maven.yaml
E2E_MAVEN_PARAMS_REVISION ?= master
E2E_MAVEN_PARAMS_URL ?= https://github.com/shashirajraja/shopping-cart
E2E_MAVEN_PARAMS_URL ?= https://github.com/Aneesh-M-Bhat/shopping-cart-test-java
E2E_TEST_DIR ?= ./test/e2e
E2E_MAVEN_PARAMS_SERVER_SECRET ?= secret-maven

Expand Down Expand Up @@ -65,7 +66,7 @@ prepare-release:
hack/release.sh $(RELEASE_DIR)

.PHONY: release
release: prepare-release
release: ${CATALOGCD} prepare-release
pushd ${RELEASE_DIR} && \
$(CATALOGCD) release \
--output release \
Expand Down Expand Up @@ -105,6 +106,7 @@ bats: install
.PHONY: prepare-e2e
prepare-e2e:
kubectl apply -f ${E2E_PVC}
kubectl apply -f ${E2E_SECRET}

# run end-to-end tests against the current kuberentes context, it will required a cluster with tekton
# pipelines and other requirements installed, before start testing the target invokes the
Expand Down
1 change: 0 additions & 1 deletion hack/release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ release() {
[[ ! -d "${RELEASE_DIR}" ]] &&
panic "Release dir is not found '${RELEASE_DIR}'!"

# releasing task-git (it's the only task)
# See task-containers if there is more than one task to support.
declare task_name=task-maven
declare task_doc=README.md
Expand Down
4 changes: 0 additions & 4 deletions test/e2e/e2e.bats
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,6 @@ source ./test/helper/helper.sh
[ -n "${E2E_MAVEN_PARAMS_REVISION}" ]
[ -n "${E2E_MAVEN_PARAMS_SERVER_SECRET}" ]

kubectl delete secret secret-maven || true

kubectl apply -f test/e2e/resources/secret-maven.yaml

run tkn pipeline start task-maven \
--param="URL=${E2E_MAVEN_PARAMS_URL}" \
--param="REVISION=${E2E_MAVEN_PARAMS_REVISION}" \
Expand Down
9 changes: 6 additions & 3 deletions test/e2e/resources/pipeline-maven.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ spec:
type: string

tasks:
- name: git
- name: git-clone
taskRef:
resolver: git
params:
Expand All @@ -30,7 +30,7 @@ spec:
- name: revision
value: p
- name: pathInRepo
value: tasks/task-git/0.2.0/task-git.yaml
value: tasks/task-git-clone/0.3.0/task-git-clone.yaml
workspaces:
- name: output
workspace: source
Expand All @@ -49,8 +49,11 @@ spec:
params:
- name: SERVER_SECRET
value: "$(params.SERVER_SECRET)"
- name: GOALS
value:
- "validate"
runAfter:
- git
- git-clone
workspaces:
- name: source
workspace: source

0 comments on commit c9c5c2f

Please sign in to comment.