Merge branch 'master' of github.com:longhorn/longhorn-tests into test…

…_engine_crash_during_live_upgrade
longhorn · Mar 8, 2024 · 881be20 · 881be20
2 parents fc07d30 + c742675
commit 881be20
Show file tree

Hide file tree

Showing 97 changed files with 1,958 additions and 407 deletions.
diff --git a/.drone.yml b/.drone.yml
@@ -27,6 +27,18 @@ steps:
   - name: socket
     path: /var/run/docker.sock
 
+- name: "build longhorn-manager-test image"
+  image: plugins/docker
+  settings:
+    dry_run: true
+    build_args:
+    - ARCH=amd64
+    dockerfile: manager/integration/Dockerfile
+    repo: longhornio/longhorn-manager-test
+  when:
+    event:
+    - pull_request
+
 - name: "publish longhorn-manager-test image"
   image: plugins/docker
   settings:
@@ -44,7 +56,7 @@ steps:
     event:
     - push
 
-- name: publish-tagged-image
+- name: "publish tagged longhorn-manager-test image"
   image: plugins/docker
   settings:
     build_args:
@@ -61,6 +73,52 @@ steps:
     event:
     - tag
 
+- name: "build longhorn-e2e-test image"
+  image: plugins/docker
+  settings:
+    dry_run: true
+    build_args:
+    - ARCH=amd64
+    dockerfile: e2e/Dockerfile
+    repo: longhornio/longhorn-e2e-test
+  when:
+    event:
+    - pull_request
+
+- name: "publish longhorn-e2e-test image"
+  image: plugins/docker
+  settings:
+    build_args:
+    - ARCH=amd64
+    custom_dns: 1.1.1.1
+    dockerfile: e2e/Dockerfile
+    password:
+      from_secret: docker_password
+    repo: longhornio/longhorn-e2e-test
+    tag: "${DRONE_BRANCH}-head-amd64"
+    username:
+      from_secret: docker_username
+  when:
+    event:
+    - push
+
+- name: "publish tagged longhorn-e2e-test image"
+  image: plugins/docker
+  settings:
+    build_args:
+    - ARCH=amd64
+    custom_dns: 1.1.1.1
+    dockerfile: e2e/Dockerfile
+    password:
+      from_secret: docker_password
+    repo: longhornio/longhorn-e2e-test
+    tag: "${DRONE_TAG}-amd64"
+    username:
+      from_secret: docker_username
+  when:
+    event:
+    - tag
+
 volumes:
 - name: socket
   host:
@@ -95,6 +153,18 @@ steps:
   - name: socket
     path: /var/run/docker.sock
 
+- name: "build longhorn-manager-test image"
+  image: plugins/docker
+  settings:
+    dry_run: true
+    build_args:
+    - ARCH=arm64
+    dockerfile: manager/integration/Dockerfile
+    repo: longhornio/longhorn-manager-test
+  when:
+    event:
+    - pull_request
+
 - name: "publish longhorn-manager-test image"
   image: plugins/docker
   settings:
@@ -112,7 +182,7 @@ steps:
     event:
     - push
 
-- name: publish-tagged-image
+- name: "publish tagged longhorn-manager-test image"
   image: plugins/docker
   settings:
     build_args:
@@ -129,6 +199,52 @@ steps:
     event:
     - tag
 
+- name: "build longhorn-e2e-test image"
+  image: plugins/docker
+  settings:
+    dry_run: true
+    build_args:
+    - ARCH=arm64
+    dockerfile: e2e/Dockerfile
+    repo: longhornio/longhorn-e2e-test
+  when:
+    event:
+    - pull_request
+
+- name: "publish longhorn-e2e-test image"
+  image: plugins/docker
+  settings:
+    build_args:
+    - ARCH=arm64
+    custom_dns: 1.1.1.1
+    dockerfile: e2e/Dockerfile
+    password:
+      from_secret: docker_password
+    repo: longhornio/longhorn-e2e-test
+    tag: "${DRONE_BRANCH}-head-arm64"
+    username:
+      from_secret: docker_username
+  when:
+    event:
+    - push
+
+- name: "publish tagged longhorn-e2e-test image"
+  image: plugins/docker
+  settings:
+    build_args:
+    - ARCH=arm64
+    custom_dns: 1.1.1.1
+    dockerfile: e2e/Dockerfile
+    password:
+      from_secret: docker_password
+    repo: longhornio/longhorn-e2e-test
+    tag: "${DRONE_TAG}-arm64"
+    username:
+      from_secret: docker_username
+  when:
+    event:
+    - tag
+
 volumes:
 - name: socket
   host:
@@ -148,7 +264,7 @@ trigger:
   - v*
 
 steps:
-- name: manifest
+- name: "publish longhorn-manager-test manifest"
   image: plugins/manifest:1
   settings:
     username:
@@ -166,7 +282,7 @@ steps:
     event:
     - push
 
-- name: manifest-tag
+- name: "publish tagged longhorn-manager-test manifest"
   image: plugins/manifest:1
   settings:
     username:
@@ -184,6 +300,42 @@ steps:
     event:
     - tag
 
+- name: "publish longhorn-e2e-test manifest"
+  image: plugins/manifest:1
+  settings:
+    username:
+      from_secret: docker_username
+    password:
+      from_secret: docker_password
+    platforms:
+      - linux/amd64
+      - linux/arm64
+    target: "longhornio/longhorn-e2e-test:${DRONE_BRANCH}-head"
+    template: "longhornio/longhorn-e2e-test:${DRONE_BRANCH}-head-ARCH"
+  when:
+    instance:
+    - drone-publish.longhorn.io
+    event:
+    - push
+
+- name: "publish tagged longhorn-e2e-test manifest"
+  image: plugins/manifest:1
+  settings:
+    username:
+      from_secret: docker_username
+    password:
+      from_secret: docker_password
+    platforms:
+      - linux/amd64
+      - linux/arm64
+    target: "longhornio/longhorn-e2e-test:${DRONE_TAG}"
+    template: "longhornio/longhorn-e2e-test:${DRONE_TAG}-ARCH"
+  when:
+    instance:
+    - drone-publish.longhorn.io
+    event:
+    - tag
+
 depends_on:
 - default-amd64
 - default-arm64
diff --git a/.github/mergify.yml b/.github/mergify.yml
@@ -5,9 +5,8 @@ pull_request_rules:
   - check-success=DCO
   - check-success=CodeFactor
   - check-success=codespell
-  - "#approved-reviews-by>=1"
+  - "#approved-reviews-by>=2"
   - approved-reviews-by=@longhorn/maintainer
-  - label=ready-to-merge
   actions:
     merge:
       method: rebase
@@ -17,18 +16,4 @@ pull_request_rules:
   - conflict
   actions:
     comment:
-      message: This pull request is now in conflicts. Could you fix it @{{author}}? 🙏
-
-# Comment on the PR to trigger backport. ex: @Mergifyio copy stable/3.1 stable/4.0
-- name: backport patches to stable branch
-  conditions:
-  - base=master
-  actions:
-    backport:
-      title: "[BACKPORT][{{ destination_branch }}] {{ title }}"
-      body: |
-        This is an automatic backport of pull request #{{number}}.
-        
-        {{cherry_pick_error}}
-      assignees:
-      - "{{ author }}"
+      message: This pull request is now in conflict. Could you fix it @{{author}}? 🙏
diff --git a/.github/workflows/codespell.yml b/.github/workflows/codespell.yml
@@ -0,0 +1,23 @@
+name: Codespell
+
+on:
+  pull_request:
+    branches:
+    - master
+    - main
+    - "v*.*.*"
+
+jobs:
+  codespell:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v4
+      with:
+        fetch-depth: 1
+    - name: Check code spell
+      uses: codespell-project/actions-codespell@v2
+      with:
+        check_filenames: true
+        skip: "*/**.yaml,*/**.yml,./scripts,./vendor,MAINTAINERS,LICENSE,go.mod,go.sum"
+        ignore_words_list: aks
diff --git a/build_engine_test_images/terraform/aws/ubuntu/main.tf b/build_engine_test_images/terraform/aws/ubuntu/main.tf
@@ -99,7 +99,7 @@ resource "aws_route_table" "build_engine_aws_public_rt" {
   }
 }
 
-# Assciate public subnet to public route table
+# Associate public subnet to public route table
 resource "aws_route_table_association" "build_engine_aws_public_subnet_rt_association" {
   depends_on = [
     aws_subnet.build_engine_aws_public_subnet,

diff --git a/build_engine_test_images/terraform/aws/ubuntu/variables.tf b/build_engine_test_images/terraform/aws/ubuntu/variables.tf
@@ -56,7 +56,7 @@ variable "build_engine_aws_instance_name" {
 
 variable "build_engine_aws_instance_type" {
   type        = string
-  description = "Recommended instance types t2.xlarge for amd64 & a1.xlarge  for arm64"
+  description = "Recommended instance types t2.xlarge for amd64 & a1.2xlarge for arm64"
   default     = ""
 }