Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: enable tls tests by default #3220

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: enable tls tests by default #3220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions .lighthouse/jenkins-x/bdd/terraform-tls.yaml.gotmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ spec:
value: "/tmp/kubecfg"
- name: TF_VAR_jx_git_url
value: https://github.com/jenkins-x-bdd/cluster-{{ .Env.TF_VAR_cluster_name }}-dev.git
- name: TF_VAR_node_spot
value: "true"
- name: TF_VAR_kuberhealthy
value: "false"
- name: TF_VAR_jx_bot_username
value: jenkins-x-bot-bdd
- name: TF_VAR_jx_bot_token
Expand Down Expand Up @@ -61,9 +65,9 @@ spec:
echo "Removing kubernetes resources from state"
terraform state rm 'module.jx.module.cluster.helm_release.jx-git-operator[0]'
terraform state rm 'module.jx.module.cluster.kubernetes_config_map.jenkins_x_requirements[0]'
terraform state rm 'module.jx.module.cluster.module.jx-health[0].helm_release.cluster-checks'
terraform state rm 'module.jx.module.cluster.module.jx-health[0].helm_release.health-checks-install'
terraform state rm 'module.jx.module.cluster.module.jx-health[0].helm_release.kuberhealthy'
terraform state rm 'module.jx.module.cluster.module.jx-health[0].helm_release.cluster-checks' || echo "Resource does not exist"
terraform state rm 'module.jx.module.cluster.module.jx-health[0].helm_release.health-checks-install' || echo "Resource does not exist"
terraform state rm 'module.jx.module.cluster.module.jx-health[0].helm_release.kuberhealthy' || echo "Resource does not exist"

echo "lets connect to the remote cluster"
$(terraform output -raw connect)
Expand Down
2 changes: 1 addition & 1 deletion .lighthouse/jenkins-x/bdd/terraform.yaml.gotmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ spec:

echo "lets verify the log completes"
jx admin log -b

echo "installing the BDD test"
export GIT_ORGANISATION="jenkins-x-bdd"
export TEST_NAME="test-create-spring"
Expand Down
2 changes: 1 addition & 1 deletion .lighthouse/jenkins-x/pullrequest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,5 +48,5 @@ spec:
name: podinfo
podTemplate: {}
serviceAccountName: bdd-bot
timeout: 240h0m0s
timeout: 2h0m0s
status: {}
4 changes: 2 additions & 2 deletions .lighthouse/jenkins-x/triggers.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ spec:
source: "pullrequest-gitea.yaml"
- name: gsm
context: "gsm"
always_run: true
always_run: false
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

will enable after tls tests pass

optional: false
trigger: (?m)^/test( all| gsm),?(s+|$)
rerun_command: /test gsm
Expand Down Expand Up @@ -81,7 +81,7 @@ spec:
source: "pullrequest.yaml"
- name: tls
context: "tls"
always_run: false
always_run: true
optional: false
trigger: (?m)^/test( all| tls),?(s+|$)
rerun_command: /test tls
Expand Down
2 changes: 1 addition & 1 deletion charts/jxgh/acme-jx/defaults.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
gitUrl: https://github.com/jenkins-x/acme
version: 0.0.24
version: 0.0.26
namespace: jx
3 changes: 1 addition & 2 deletions src/Makefile.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,10 +288,9 @@ kubectl-apply:
@echo "using kubectl to apply resources"

# NOTE be very careful about these 2 labels as getting them wrong can remove stuff in you cluster!
kubectl apply $(KUBECTL_APPLY_FLAGS) --prune -l=gitops.jenkins-x.io/pipeline=customresourcedefinitions -R -f $(OUTPUT_DIR)/customresourcedefinitions
kubectl apply $(KUBECTL_APPLY_FLAGS) --prune -l=gitops.jenkins-x.io/pipeline=cluster -R -f $(OUTPUT_DIR)/cluster
kubectl apply $(KUBECTL_APPLY_FLAGS) --prune -l=gitops.jenkins-x.io/pipeline=namespaces -R -f $(OUTPUT_DIR)/namespaces

kubectl apply $(KUBECTL_APPLY_FLAGS) --prune -l=gitops.jenkins-x.io/pipeline=customresourcedefinitions -R -f $(OUTPUT_DIR)/customresourcedefinitions
# lets apply any infrastructure specific labels or annotations to enable IAM roles on ServiceAccounts etc
jx gitops postprocess

Expand Down