Skip to content
This repository was archived by the owner on Sep 17, 2024. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
4 changes: 2 additions & 2 deletions .ci/Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ pipeline {
githubCheckNotify('PENDING') // we want to notify the upstream about the e2e the soonest
stash allowEmpty: true, name: 'source', useDefaultExcludes: false
setEnvVar("GO_VERSION", readFile("${env.WORKSPACE}/${env.BASE_DIR}/.go-version").trim())
setEnvVar("LABELS_STRING", "buildURL=${env.BUILD_URL} gitSha=${env.GIT_BASE_COMMIT}")
setEnvVar("LABELS_STRING", "buildURL=${env.BUILD_URL} gitSha=${env.GIT_BASE_COMMIT} build=${env.BUILD_ID} repo=${env.REPO} branch=${env.BRANCH_NAME.toLowerCase()} environment=ci")
checkSkipTests()
}
}
Expand Down Expand Up @@ -337,7 +337,7 @@ def sshexec(workspace, connection, cmd){
}

def scpr(workspace, connection, remote_src, local_dst){
retryWithSleep(retries: 3, seconds: 5, backoff: true){
retryWithSleep(retries: 3, seconds: 5, backoff: true){
sh "scp -r -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i ${workspace}/e2essh ${connection.user}@${connection.ip}:${remote_src} ${local_dst}"
}
}
Expand Down
2 changes: 1 addition & 1 deletion .ci/ansible/playbook.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
- name: Create test environment
hosts: localhost
gather_facts: no
gather_facts: yes
Copy link
Member Author

Choose a reason for hiding this comment

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

ansible_date_time is part of the facts, otherwise:

[2022-04-21T17:19:09.430Z] fatal: [localhost]: FAILED! => {"msg": "The task includes an option with an undefined variable. The error was: 'ansible_date_time' is undefined

vars:
ansible_user: "{{nodeUser}}"
tasks:
Expand Down
11 changes: 11 additions & 0 deletions .ci/ansible/tasks/runners.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@
key_material: "{{ lookup('file', sshPublicKey) }}"
region: us-east-2
state: present
tags:
branch: "{{branch | default('Not running on CI')}}"
build: "{{build | default('Not running on CI')}}"
created_date: "{{ansible_date_time.epoch}}"
Copy link
Member Author

@v1v v1v Apr 21, 2022

Choose a reason for hiding this comment

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

I've found this here

environment: "{{environment | default('Not running on CI')}}"
repo: "{{repo | default('Not running on CI')}}"
tags:
- provision-stack
- start-node
Expand All @@ -23,6 +29,11 @@
Kind: "{{nodeLabel}}"
Name: "e2e-{{nodeLabel}}-{{runId}}"
ReaperMark: "e2e-testing-vm"
Copy link
Member Author

Choose a reason for hiding this comment

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

Should I standardise the tag names with lowercase and _ separator?

Copy link
Contributor

Choose a reason for hiding this comment

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

If that's the preference/standard, sounds good to me. Please remember to update the reaper pipeline.

branch: "{{branch | default('Not running on CI')}}"
build: "{{build | default('Not running on CI')}}"
created_date: "{{ansible_date_time.epoch}}"
environment: "{{environment | default('Not running on CI')}}"
repo: "{{repo | default('Not running on CI')}}"
count_tag:
Name: "e2e-{{nodeLabel}}-{{runId}}"
volumes:
Expand Down