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.

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

Nr 360782 ubuntu16 support #195

Open
wants to merge 22 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all 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
26 changes: 13 additions & 13 deletions .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ jobs:

# Runs E2E tests using the packages available in the tmp-pr-#PR prerelease
run_e2e_tests_prerelease:
needs: [ setup_environment,upload_official_packages_to_prerelease ]
needs: [ setup_environment, upload_official_packages_to_prerelease ]
name: Run E2E tests by installing NRIA from Production and installing Fluent Bit from the PR pre-release
uses: ./.github/workflows/run_e2e_tests.yml
with:
Expand Down Expand Up @@ -229,15 +229,15 @@ jobs:
gpg_passphrase: ${{ secrets.OHAI_GPG_PASSPHRASE }}
gpg_private_key_base64: ${{ secrets.OHAI_GPG_PRIVATE_KEY_BASE64 }} # base64 encoded

# run_e2e_tests_staging:
# needs: [ setup_environment, run_e2e_tests_prerelease, publish_linux_to_staging ]
# if: |
# always() && !failure() && !cancelled()
# name: Run E2E tests for all supported packages installing NRIA+FB from staging
# uses: ./.github/workflows/run_e2e_tests.yml
# with:
# gh_release_name: ${{ needs.setup_environment.outputs.pre_release_name }}
# infra_agent_version: latest
# infra_agent_env: staging
# test_report_filename: test-report-staging.xml
# secrets: inherit
run_e2e_tests_staging:
needs: [ setup_environment, run_e2e_tests_prerelease, publish_linux_to_staging ]
if: |
always() && !failure() && !cancelled()
name: Run E2E tests for all supported packages installing NRIA+FB from staging
uses: ./.github/workflows/run_e2e_tests.yml
with:
gh_release_name: ${{ needs.setup_environment.outputs.pre_release_name }}
infra_agent_version: latest
infra_agent_env: staging
test_report_filename: test-report-staging.xml
secrets: inherit
1 change: 1 addition & 0 deletions ansible/provision-and-execute-tests/aws_ec2.yml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ groups:
suse_15: "tags.os_version.startswith('15')"
windows: "'windows-server' in tags.os_distro"
linux: "'windows-server' not in tags.os_distro"
xenial: "tags.os_version.startswith('xenial')"
compose:
# This is how the Ansible SSM plugin will connect to each host. We cannot use the hostname (tag:Name) directly because
# it contains "." characters, which are not allowed by the SSM plugin.
Expand Down
1 change: 1 addition & 0 deletions ansible/provision-and-execute-tests/group_vars/xenail.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ansible_python_interpreter: /usr/bin/python
2 changes: 1 addition & 1 deletion versions/common.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
fbVersion: 3.2.2
fbVersion: 3.2.3

# This file, together with each distro file are processed and merged incrementally to
# build all the information required to download and test each package. Each package ends
Expand Down
2 changes: 1 addition & 1 deletion versions/strategyMatrix.py
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ def list_distro_files():
return [
filename
for filename in os.listdir(".")
if (filename.startswith("windows"))
if (filename.startswith("ubuntu_16"))
and filename != "common.yml"
]
except Exception as e:
Expand Down
5 changes: 5 additions & 0 deletions versions/ubuntu_16_xenial.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
osDistro: ubuntu
osVersion: xenial
packages:
- arch: amd64
ami: ami-01e7407a20284c7ff
Loading