Skip to content

Commit

Permalink
Merge branch 'release-1.3' into release-1.3-update-junus-idp-cli
Browse files Browse the repository at this point in the history
  • Loading branch information
kim-tsao authored Nov 4, 2024
2 parents 30ce0b8 + f230d47 commit 238a7bd
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
10 changes: 5 additions & 5 deletions .ibm/pipelines/openshift-ci-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -186,9 +186,9 @@ apply_yaml_files() {
oc apply -f "$dir/resources/config_map/configmap-rbac-policy-rhdh.yaml" --namespace="${project}"
oc apply -f "$dir/auth/secrets-rhdh-secrets.yaml" --namespace="${project}"

sleep 20 # wait for Pipeline Operator to be ready
oc apply -f "$dir/resources/pipeline-run/hello-world-pipeline.yaml"
oc apply -f "$dir/resources/pipeline-run/hello-world-pipeline-run.yaml"
#sleep 20 # wait for Pipeline Operator to be ready
#oc apply -f "$dir/resources/pipeline-run/hello-world-pipeline.yaml"
#oc apply -f "$dir/resources/pipeline-run/hello-world-pipeline-run.yaml"
}

run_tests() {
Expand Down Expand Up @@ -278,7 +278,7 @@ install_pipelines_operator() {
initiate_deployments() {
add_helm_repos
configure_namespace "${NAME_SPACE}"
install_pipelines_operator "${DIR}"
#install_pipelines_operator "${DIR}"
install_helm
uninstall_helmchart "${NAME_SPACE}" "${RELEASE_NAME}"

Expand All @@ -295,7 +295,7 @@ initiate_deployments() {
configure_external_postgres_db "${NAME_SPACE_RBAC}"


install_pipelines_operator "${DIR}"
#install_pipelines_operator "${DIR}"
uninstall_helmchart "${NAME_SPACE_RBAC}" "${RELEASE_NAME_RBAC}"
apply_yaml_files "${DIR}" "${NAME_SPACE_RBAC}"
echo "Deploying image from repository: ${QUAY_REPO}, TAG_NAME: ${TAG_NAME}, in NAME_SPACE : ${RELEASE_NAME_RBAC}"
Expand Down
2 changes: 1 addition & 1 deletion e2e-tests/playwright/e2e/plugins/tekton/tekton.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { Catalog } from '../../../support/pages/Catalog';
// Pre-req: A kubernetes cluster containing pipeline and pipelinerun resources labeled with backstage.io/kubernetes-id: developer-hub
// Pre-req: A catalog entity with the matching backstage.io/kubernetes-id: developer-hub annotation as well as the janus-idp.io/tekton : <BACKSTAGE_ENTITY_NAME> annotation

test.describe('Test Tekton plugin', () => {
test.describe.skip('Test Tekton plugin', () => {
let common: Common;
let uiHelper: UIhelper;
let tekton: Tekton;
Expand Down

0 comments on commit 238a7bd

Please sign in to comment.