Skip to content

Commit

Permalink
chore: run one e2e test
Browse files Browse the repository at this point in the history
Signed-off-by: Nikita Korolev <[email protected]>
  • Loading branch information
universal-itengineer committed Apr 17, 2024
1 parent 9cf80b9 commit c74f4c0
Show file tree
Hide file tree
Showing 4 changed files with 107 additions and 20 deletions.
68 changes: 59 additions & 9 deletions .github/workflows/e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ name: e2e

env:
CI_COMMIT_REF_NAME: ${{ github.ref_name }}
# E2E_CLUSTERTRANSPORT_TOKEN: ${{ secrets.E2E_VIRTUALIZATION_SA_TOKEN }}

on:
pull_request:
Expand All @@ -22,8 +23,13 @@ concurrency:
jobs:
show_dev_manifest:
runs-on: ubuntu-latest
name: Show manifest
name: Run e2e
steps:
- name: Set up Go 1.21
uses: actions/setup-go@v5
with:
go-version: "1.21"

- name: Install Task
uses: arduino/setup-task@v2

Expand All @@ -38,13 +44,57 @@ jobs:
method: service-account
k8s-url: https://api.e2e.virtlab.flant.com
k8s-secret: ${{ secrets.E2E_VIRTUALIZATION_SA_SECRET }}
# token: ${{ secrets.E2E_VIRTUALIZATION_SA_TOKEN }}

- name: Create Namespace
run: |
kubectl create namespace testgh

- name: Get ns and delete
- name: e2e
run: |
kubectl get ns | grep testgh
kubectl delete namespace testgh
export E2E_CLUSTERTRANSPORT_KUBECONFIG=$KUBECONFIG
echo "show context"
kubectl config get-contexts
echo "--"
echo "Show KUBECONFIG env"
echo $KUBECONFIG
echo "--"
echo "Show E2E_CLUSTERTRANSPORT_KUBECONFIG env"
echo $E2E_CLUSTERTRANSPORT_KUBECONFIG
echo "--"
echo " "
echo "Get NS"
kubectl get ns
task
task e2e:run_one TEST="Label and Annotation"
# run: |
# kubectl config view -o jsonpath='{"Cluster name\tServer\n"}{range .clusters[*]}{.name}{"\t"}{.cluster.server}{"\n"}{end}'

# export E2E_CLUSTERTRANSPORT_ENDPOINT="https://api.e2e.virtlab.flant.com"
# export CLUSTER_NAME="e2e-cluster"
# export E2E_CLUSTERTRANSPORT_ENDPOINT=$(kubectl config view -o jsonpath="{.clusters[?(@.name==\"$CLUSTER_NAME\")].cluster.server}")
# export E2E_CLUSTERTRANSPORT_TOKEN=$(echo ${{ secrets.E2E_VIRTUALIZATION_SA_TOKEN }})

# export E2E_CLUSTERTRANSPORT_TOKEN=$(echo ${{ secrets.E2E_VIRTUALIZATION_SA_SECRET }} | yq '.data.token' | base64 -d)

# echo ${{ secrets.E2E_VIRTUALIZATION_SA_SECRET }} | yq e '.data."ca.crt"' | base64 -d > ca.crt
# export E2E_CLUSTERTRANSPORT_CERTIFICATEAUTHORITY="$PWD/ca.crt"

# export E2E_CLUSTERTRANSPORT_INSECURETLS="true"

# task e2e:run_one TEST="Label and Annotation"
# export E2E_CLUSTERTRANSPORT_KUBECONFIG=$KUBECONFIG



# - name: Create Namespace
# run: |
# kubectl create namespace testgh

# - name: Get ns and delete
# run: |
# kubectl get ns | grep testgh
# kubectl delete namespace testgh
31 changes: 31 additions & 0 deletions ca.crt
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
-----BEGIN CERTIFICATE-----
MIIFazCCA1OgAwIBAgIRAIIQz7DSQONZRGPgu2OCiwAwDQYJKoZIhvcNAQELBQAw
TzELMAkGA1UEBhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2Vh
cmNoIEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDEwHhcNMTUwNjA0MTEwNDM4
WhcNMzUwNjA0MTEwNDM4WjBPMQswCQYDVQQGEwJVUzEpMCcGA1UEChMgSW50ZXJu
ZXQgU2VjdXJpdHkgUmVzZWFyY2ggR3JvdXAxFTATBgNVBAMTDElTUkcgUm9vdCBY
MTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAK3oJHP0FDfzm54rVygc
h77ct984kIxuPOZXoHj3dcKi/vVqbvYATyjb3miGbESTtrFj/RQSa78f0uoxmyF+
0TM8ukj13Xnfs7j/EvEhmkvBioZxaUpmZmyPfjxwv60pIgbz5MDmgK7iS4+3mX6U
A5/TR5d8mUgjU+g4rk8Kb4Mu0UlXjIB0ttov0DiNewNwIRt18jA8+o+u3dpjq+sW
T8KOEUt+zwvo/7V3LvSye0rgTBIlDHCNAymg4VMk7BPZ7hm/ELNKjD+Jo2FR3qyH
B5T0Y3HsLuJvW5iB4YlcNHlsdu87kGJ55tukmi8mxdAQ4Q7e2RCOFvu396j3x+UC
B5iPNgiV5+I3lg02dZ77DnKxHZu8A/lJBdiB3QW0KtZB6awBdpUKD9jf1b0SHzUv
KBds0pjBqAlkd25HN7rOrFleaJ1/ctaJxQZBKT5ZPt0m9STJEadao0xAH0ahmbWn
OlFuhjuefXKnEgV4We0+UXgVCwOPjdAvBbI+e0ocS3MFEvzG6uBQE3xDk3SzynTn
jh8BCNAw1FtxNrQHusEwMFxIt4I7mKZ9YIqioymCzLq9gwQbooMDQaHWBfEbwrbw
qHyGO0aoSCqI3Haadr8faqU9GY/rOPNk3sgrDQoo//fb4hVC1CLQJ13hef4Y53CI
rU7m2Ys6xt0nUW7/vGT1M0NPAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNV
HRMBAf8EBTADAQH/MB0GA1UdDgQWBBR5tFnme7bl5AFzgAiIyBpY9umbbjANBgkq
hkiG9w0BAQsFAAOCAgEAVR9YqbyyqFDQDLHYGmkgJykIrGF1XIpu+ILlaS/V9lZL
ubhzEFnTIZd+50xx+7LSYK05qAvqFyFWhfFQDlnrzuBZ6brJFe+GnY+EgPbk6ZGQ
3BebYhtF8GaV0nxvwuo77x/Py9auJ/GpsMiu/X1+mvoiBOv/2X/qkSsisRcOj/KK
NFtY2PwByVS5uCbMiogziUwthDyC3+6WVwW6LLv3xLfHTjuCvjHIInNzktHCgKQ5
ORAzI4JMPJ+GslWYHb4phowim57iaztXOoJwTdwJx4nLCgdNbOhdjsnvzqvHu7Ur
TkXWStAmzOVyyghqpZXjFaH3pO3JLF+l+/+sKAIuvtd7u+Nxe5AW0wdeRlN8NwdC
jNPElpzVmbUq4JUagEiuTDkHzsxHpFKVK7q4+63SM1N95R1NbdWhscdCb+ZAJzVc
oyi3B43njTOQ5yOf+1CceWxG1bQVs5ZufpsMljq4Ui0/1lvh+wjChP4kqKOJ2qxq
4RgqsahDYVvTH9w7jXbyLeiNdd8XM2w9U/t7y0Ff/9yi0GE44Za4rF2LN9d11TPA
mRGunUHBcnWEvgJBQl9nJEiU0Zsnvgc/ubhPgXRR4Xq37Z0j4r7g1SgEEzwxA57d
emyPxgcYxn/eR44/KJ4EBs+lVDR3veyJm+kXQ99b21/+jh5Xos1AnX5iItreGCc=
-----END CERTIFICATE-----
25 changes: 14 additions & 11 deletions tests/e2e/Taskfile.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ version: "3"
silent: true

vars:
E2E_CLUSTERTRANSPORT_KUBECONFIG: '{{default "$HOME/.kube/config" .E2E_CLUSTERTRANSPORT_KUBECONFIG}}'
# E2E_CLUSTERTRANSPORT_KUBECONFIG: '{{ .E2E_CLUSTERTRANSPORT_KUBECONFIG | default "$HOME/.kube/config"}}'
GINKGO_VERSION: "2.13.2"
VERSION: "v1.0.0"

Expand All @@ -22,9 +22,9 @@ tasks:
ginkgo:
cmds:
- |
v=($(ginkgo version 2>/dev/null))
if [ "${v[2]}" != "{{ .GINKGO_VERSION }}" ]; then
go install github.com/onsi/ginkgo/v2/ginkgo@v"{{ .GINKGO_VERSION }}" ;
v=($(ginkgo version 2>/dev/null))
if [ "${v[2]}" != "{{ .GINKGO_VERSION }}" ]; then
go install github.com/onsi/ginkgo/v2/ginkgo@v"{{ .GINKGO_VERSION }}" ;
fi
run:
desc: "Run e2e tests"
Expand All @@ -51,13 +51,16 @@ tasks:
- ginkgo
cmds:
- |
{{if .TEST }}
export E2E_CLUSTERTRANSPORT_KUBECONFIG={{.E2E_CLUSTERTRANSPORT_KUBECONFIG}}
ginkgo --focus "{{ .TEST }}" -v
{{else}}
echo "Specify test to run"
echo 'Example: TEST="Label and Annotation" task run_one'
{{end}}
export E2E_CLUSTERTRANSPORT_KUBECONFIG=$KUBECONFIG
ginkgo version
ginkgo --focus "{{ .TEST }}" -v
# {{if .TEST }}
# export E2E_CLUSTERTRANSPORT_KUBECONFIG={{.E2E_CLUSTERTRANSPORT_KUBECONFIG}}
# ginkgo --focus "{{ .TEST }}" -v
# {{else}}
# echo "Specify test to run"
# echo 'Example: TEST="Label and Annotation" task run_one'
# {{end}}

fix:ssh_key_perm:
desc: "Check and fix rights for ssh keys"
Expand Down
3 changes: 3 additions & 0 deletions tests/e2e/tests_suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
virt "github.com/deckhouse/virtualization/tests/e2e/virtctl"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
"sigs.k8s.io/yaml"
"testing"
"time"
)
Expand All @@ -32,6 +33,8 @@ func init() {
if conf, err = config.GetConfig(); err != nil {
panic(err)
}
b, _ := yaml.Marshal(conf)
fmt.Println(string(b))
if kubectl, err = kc.NewKubectl(kc.KubectlConf(conf.ClusterTransport)); err != nil {
panic(err)
}
Expand Down

0 comments on commit c74f4c0

Please sign in to comment.