Skip to content

Commit d63bb7c

Browse files
committed
fix: enable tls tests by default
Signed-off-by: ankitm123 <[email protected]>
1 parent f63336f commit d63bb7c

File tree

6 files changed

+13
-9
lines changed

6 files changed

+13
-9
lines changed

.lighthouse/jenkins-x/bdd/terraform-tls.yaml.gotmpl

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ spec:
66
value: "/tmp/kubecfg"
77
- name: TF_VAR_jx_git_url
88
value: https://github.com/jenkins-x-bdd/cluster-{{ .Env.TF_VAR_cluster_name }}-dev.git
9+
- name: TF_VAR_node_spot
10+
value: "true"
11+
- name: TF_VAR_kuberhealthy
12+
value: "false"
913
- name: TF_VAR_jx_bot_username
1014
value: jenkins-x-bot-bdd
1115
- name: TF_VAR_jx_bot_token
@@ -61,9 +65,9 @@ spec:
6165
echo "Removing kubernetes resources from state"
6266
terraform state rm 'module.jx.module.cluster.helm_release.jx-git-operator[0]'
6367
terraform state rm 'module.jx.module.cluster.kubernetes_config_map.jenkins_x_requirements[0]'
64-
terraform state rm 'module.jx.module.cluster.module.jx-health[0].helm_release.cluster-checks'
65-
terraform state rm 'module.jx.module.cluster.module.jx-health[0].helm_release.health-checks-install'
66-
terraform state rm 'module.jx.module.cluster.module.jx-health[0].helm_release.kuberhealthy'
68+
terraform state rm 'module.jx.module.cluster.module.jx-health[0].helm_release.cluster-checks' || echo "Resource does not exist"
69+
terraform state rm 'module.jx.module.cluster.module.jx-health[0].helm_release.health-checks-install' || echo "Resource does not exist"
70+
terraform state rm 'module.jx.module.cluster.module.jx-health[0].helm_release.kuberhealthy' || echo "Resource does not exist"
6771

6872
echo "lets connect to the remote cluster"
6973
$(terraform output -raw connect)

.lighthouse/jenkins-x/bdd/terraform.yaml.gotmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ spec:
8282

8383
echo "lets verify the log completes"
8484
jx admin log -b
85-
85+
8686
echo "installing the BDD test"
8787
export GIT_ORGANISATION="jenkins-x-bdd"
8888
export TEST_NAME="test-create-spring"

.lighthouse/jenkins-x/pullrequest.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,5 +48,5 @@ spec:
4848
name: podinfo
4949
podTemplate: {}
5050
serviceAccountName: bdd-bot
51-
timeout: 240h0m0s
51+
timeout: 2h0m0s
5252
status: {}

.lighthouse/jenkins-x/triggers.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ spec:
4646
source: "pullrequest-gitea.yaml"
4747
- name: gsm
4848
context: "gsm"
49-
always_run: true
49+
always_run: false
5050
optional: false
5151
trigger: (?m)^/test( all| gsm),?(s+|$)
5252
rerun_command: /test gsm
@@ -81,7 +81,7 @@ spec:
8181
source: "pullrequest.yaml"
8282
- name: tls
8383
context: "tls"
84-
always_run: false
84+
always_run: true
8585
optional: false
8686
trigger: (?m)^/test( all| tls),?(s+|$)
8787
rerun_command: /test tls

charts/jxgh/acme-jx/defaults.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
gitUrl: https://github.com/jenkins-x/acme
2-
version: 0.0.24
2+
version: 0.0.26
33
namespace: jx
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
issuer:
2-
enabled: true
2+
enabled: false
33
cluster: true

0 commit comments

Comments
 (0)