Add a jenkins job for upgrade and to run weekly.

- Also update the existing jobs trigger phrase.
- Fix alignment.

Signed-off-by: Anand Kumar <[email protected]>

CONTRIBUTING.md

@@ -81,10 +81,18 @@ Here are the trigger phrases for individual checks:
 - `/nephe-test-e2e-azure`: Run end-to-end Azure tests on a Kind cluster with Azure VMs
 - `/nephe-test-e2e-eks`: Run end-to-end AWS tests on EKS cluster with AWS VMs
 - `/nephe-test-e2e-aks`: Run end-to-end Azure tests on AKS cluster with Azure VMs
+- `/nephe-test-e2e-aws-upgrade`: Run end-to-end AWS upgrade tests on a Kind cluster with AWS VMs
+- `/nephe-test-e2e-azure-upgrade`: Run end-to-end Azure upgrade tests on a Kind cluster with Azure VMs
+- `/nephe-test-e2e-eks-linux-agent`: Run end-to-end AWS tests on EKS cluster with AWS VMs with Linux agent installed
+- `/nephe-test-e2e-aks-linux-agent`: Run end-to-end Azure tests on AKS cluster with Azure VMs with Linux agent installed
+- `/nephe-test-e2e-eks-windows-agent`: Run end-to-end AWS tests on EKS cluster with AWS VMs with Windows agent installed
+- `/nephe-test-e2e-aks-windows-agent`: Run end-to-end Azure tests on AKS cluster with Azure VMs with Windows agent installed
 
 Here are the trigger phrases for groups of checks:
 
-- `/nephe-test-e2e-kind`: Run end-to-end tests on a Kind cluster.
+- `/nephe-test-e2e-agentless`: Run all the end-to-end tests on a kind cluster.
+- `/nephe-test-e2e-agentless-upgrade`: Run all the end-to-end upgrade tests on a kind cluster.
+- `/nephe-test-e2e-agented`: Run all the end-to-end tests on AKS and EKS cluster with VM agent installed.
 - `/nephe-test-e2e-all`: Runs all the end-to-end tests.
 
 For more information about the tests we run as part of CI, please refer to

ci/jenkins/README.md

@@ -80,3 +80,9 @@ cloud will be automatically updated with the new changes.
 - `nephe-test-e2e-azure-for-pull-request`: Run end-to-end Azure tests on a Kind cluster with Azure VMs
 - `nephe-test-e2e-eks-for-pull-request`: Run end-to-end AWS tests on EKS cluster with AWS VMs
 - `nephe-test-e2e-aks-for-pull-request`: Run end-to-end Azure tests on AKS cluster with Azure VMs
+- `nephe-test-e2e-aws-upgrade-for-pull-request`: Run end-to-end AWS upgrade tests on a Kind cluster with AWS VMs
+- `nephe-test-e2e-azure-upgrade-for-pull-request`: Run end-to-end Azure upgrade tests on a Kind cluster with Azure VMs
+- `nephe-test-e2e-with-agent-eks-for-pull-request`: Run end-to-end AWS tests on EKS cluster with AWS VMs with Linux agent installed.
+- `nephe-test-e2e-with-agent-aks--for-pull-request`: Run end-to-end Azure tests on AKS cluster with Azure VMs with Linux agent installed.
+- `nephe-test-e2e-with-windows-eks-for-pull-request`: Run end-to-end AWS tests on EKS cluster with AWS VMs with Windows agent installed.
+- `nephe-test-e2e-with-windows-aks-for-pull-request`: Run end-to-end Azure tests on AKS cluster with Azure VMs with Windows agent installed.

ci/jenkins/jobs/macros.yaml

@@ -38,6 +38,27 @@
                   --vcCluster "${VC_CLUSTER}" --resourcePool "${RESOURCEPOOLPATH}" --vcNetwork "${VMC_NETWORK_1}" \
                   --virtualMachine "${VIRTUAL_MACHINE}" --goVcPassword "${GOVC_PASSWORD}" --testType azure \
                   --dockerUser "${DOCKER_USERNAME}" --dockerPassword "${DOCKER_PASSWORD}"
+- builder:
+    name: deploy-vm-and-run-aws-upgrade-tests-for-nephe
+    builders:
+      - shell: |-
+          #!/bin/bash
+          ./ci/jenkins/nephe-ci.sh --buildnumber "${BUILD_NUMBER}" --vchost "${VC_HOST}" \
+                  --vcuser "${VC_USER}" --datacenter "${DATACENTERNAME}" --datastore "${DATA_STORE}" \
+                  --vcCluster "${VC_CLUSTER}" --resourcePool "${RESOURCEPOOLPATH}" --vcNetwork "${VMC_NETWORK_1}" \
+                  --virtualMachine "${VIRTUAL_MACHINE}" --goVcPassword "${GOVC_PASSWORD}" --testType aws-upgrade \
+                  --dockerUser "${DOCKER_USERNAME}" --dockerPassword "${DOCKER_PASSWORD}"
+- builder:
+    name: deploy-vm-and-run-azure-upgrade-tests-for-nephe
+    builders:
+      - shell: |-
+          #!/bin/bash
+          ./ci/jenkins/nephe-ci.sh --buildnumber "${BUILD_NUMBER}" --vchost "${VC_HOST}" \
+                  --vcuser "${VC_USER}" --datacenter "${DATACENTERNAME}" --datastore "${DATA_STORE}" \
+                  --vcCluster "${VC_CLUSTER}" --resourcePool "${RESOURCEPOOLPATH}" --vcNetwork "${VMC_NETWORK_1}" \
+                  --virtualMachine "${VIRTUAL_MACHINE}" --goVcPassword "${GOVC_PASSWORD}" --testType azure-upgrade \
+                  --dockerUser "${DOCKER_USERNAME}" --dockerPassword "${DOCKER_PASSWORD}"
+
 - builder:
     name: deploy-vm-and-run-eks-tests-for-nephe
     builders: