Skip to content

Commit

Permalink
Revert "(fleet) make new-e2e-updater manual (#24032)" (#24034)
Browse files Browse the repository at this point in the history 
This reverts commit 92f92e3.
  • Loading branch information
@amenasria
amenasria authored Mar 22, 2024
1 parent eb5280d commit 0aba308
Showing 1 changed file with 66 additions and 64 deletions.
130 changes: 66 additions & 64 deletions .gitlab-ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -211,45 +211,46 @@ variables:

# List of parameters retrieved from AWS SSM
# They must be defined as environment variables in the GitLab CI/CD settings, to ease rotation if needed
AGENT_QA_PROFILE_SSM_NAME: ci.datadog-agent.agent-qa-profile # agent-ci-experience
API_KEY_ORG2_SSM_NAME: ci.datadog-agent.datadog_api_key_org2 # agent-ci-experience
API_KEY_SSM_NAME: ci.datadog-agent.datadog_api_key # agent-ci-experience
APP_KEY_ORG2_SSM_NAME: ci.datadog-agent.datadog_app_key_org2 # agent-ci-experience
ARTIFACTORY_TOKEN_SSM_NAME: ci.datadog-agent.artifactory_token # agent-ci-experience
ARTIFACTORY_BYPASS_SSM_NAME: ci.datadog-agent.artifactory_bypass # agent-ci-experience
CHANGELOG_COMMIT_SHA_SSM_NAME: ci.datadog-agent.changelog_commit_sha # agent-ci-experience
CHOCOLATEY_API_KEY_SSM_NAME: ci.datadog-agent.chocolatey_api_key # windows-agent
DEB_GPG_KEY_SSM_NAME: ci.datadog-agent.deb_signing_private_key_v2_${DEB_GPG_KEY_ID} # agent-build-and-release
DEB_SIGNING_PASSPHRASE_SSM_NAME: ci.datadog-agent.deb_signing_key_passphrase_v2_${DEB_GPG_KEY_ID} # agent-build-and-release
DOCKER_REGISTRY_LOGIN_SSM_KEY: ci.datadog-agent.docker_hub_login # agent-ci-experience
DOCKER_REGISTRY_PWD_SSM_KEY: ci.datadog-agent.docker_hub_pwd # agent-ci-experience
E2E_TESTS_API_KEY_SSM_NAME: ci.datadog-agent.e2e_tests_api_key # agent-developer-tools
E2E_TESTS_APP_KEY_SSM_NAME: ci.datadog-agent.e2e_tests_app_key # agent-developer-tools
E2E_TESTS_RC_KEY_SSM_NAME: ci.datadog-agent.e2e_tests_rc_key # agent-developer-tools
KITCHEN_EC2_SSH_KEY_SSM_NAME: ci.datadog-agent.aws_ec2_kitchen_ssh_key # agent-developer-tools
KITCHEN_AZURE_CLIENT_ID_SSM_NAME: ci.datadog-agent.azure_kitchen_client_id # agent-developer-tools
KITCHEN_AZURE_CLIENT_SECRET_SSM_NAME: ci.datadog-agent.azure_kitchen_client_secret # agent-developer-tools
KITCHEN_AZURE_SUBSCRIPTION_ID_SSM_NAME: ci.datadog-agent.azure_kitchen_subscription_id # agent-developer-tools
KITCHEN_AZURE_TENANT_ID_SSM_NAME: ci.datadog-agent.azure_kitchen_tenant_id # agent-developer-tools
GITLAB_SCHEDULER_TOKEN_SSM_NAME: ci.datadog-agent.gitlab_pipelines_scheduler_token # ci-cd
GITLAB_READ_API_TOKEN_SSM_NAME: ci.datadog-agent.gitlab_read_api_token # ci-cd
INSTALL_SCRIPT_API_KEY_SSM_NAME: ci.agent-linux-install-script.datadog_api_key # agent-build-and-release
JIRA_READ_API_TOKEN_SSM_NAME: ci.datadog-agent.jira_read_api_token # agent-ci-experience
MACOS_GITHUB_APP_ID_SSM_NAME: ci.datadog-agent.macos_github_app_id # agent-ci-experience
MACOS_GITHUB_INSTALLATION_ID_SSM_NAME: ci.datadog-agent.macos_github_installation_id # agent-ci-experience
MACOS_GITHUB_KEY_SSM_NAME: ci.datadog-agent.macos_github_key_b64 # agent-ci-experience
RPM_GPG_KEY_SSM_NAME: ci.datadog-agent.rpm_signing_private_key_v2_${RPM_GPG_KEY_ID} # agent-build-and-release
RPM_SIGNING_PASSPHRASE_SSM_NAME: ci.datadog-agent.rpm_signing_key_passphrase_v2_${RPM_GPG_KEY_ID} # agent-build-and-release
SMP_ACCOUNT_ID_SSM_NAME: ci.datadog-agent.single-machine-performance-account-id # single-machine-performance
SMP_AGENT_TEAM_ID_SSM_NAME: ci.datadog-agent.single-machine-performance-agent-team-id # single-machine-performance
SMP_API_SSM_NAME: ci.datadog-agent.single-machine-performance-api # single-machine-performance
SMP_BOT_ACCESS_KEY_SSM_NAME: ci.datadog-agent.single-machine-performance-bot-access-key # single-machine-performance
SMP_BOT_ACCESS_KEY_ID_SSM_NAME: ci.datadog-agent.single-machine-performance-bot-access-key-id # single-machine-performance
SSH_KEY_SSM_NAME: ci.datadog-agent.ssh_key # system-probe
SSH_KEY_RSA_SSM_NAME: ci.datadog-agent.ssh_key_rsa # agent-developer-tools
SSH_PUBLIC_KEY_RSA_SSM_NAME: ci.datadog-agent.ssh_public_key_rsa # agent-developer-tools
VCPKG_BLOB_SAS_URL_SSM_NAME: ci.datadog-agent-buildimages.vcpkg_blob_sas_url # windows-agent
WINGET_PAT_SSM_NAME: ci.datadog-agent.winget_pat # windows-agent
AGENT_QA_PROFILE_SSM_NAME: ci.datadog-agent.agent-qa-profile # agent-ci-experience
API_KEY_ORG2_SSM_NAME: ci.datadog-agent.datadog_api_key_org2 # agent-ci-experience
API_KEY_SSM_NAME: ci.datadog-agent.datadog_api_key # agent-ci-experience
APP_KEY_ORG2_SSM_NAME: ci.datadog-agent.datadog_app_key_org2 # agent-ci-experience
ARTIFACTORY_TOKEN_SSM_NAME: ci.datadog-agent.artifactory_token # agent-ci-experience
ARTIFACTORY_BYPASS_SSM_NAME: ci.datadog-agent.artifactory_bypass # agent-ci-experience
CHANGELOG_COMMIT_SHA_SSM_NAME: ci.datadog-agent.changelog_commit_sha # agent-ci-experience
CHOCOLATEY_API_KEY_SSM_NAME: ci.datadog-agent.chocolatey_api_key # windows-agent
DEB_GPG_KEY_SSM_NAME: ci.datadog-agent.deb_signing_private_key_v2_${DEB_GPG_KEY_ID} # agent-build-and-release
DEB_SIGNING_PASSPHRASE_SSM_NAME: ci.datadog-agent.deb_signing_key_passphrase_v2_${DEB_GPG_KEY_ID} # agent-build-and-release
DOCKER_REGISTRY_LOGIN_SSM_KEY: ci.datadog-agent.docker_hub_login # agent-ci-experience
DOCKER_REGISTRY_PWD_SSM_KEY: ci.datadog-agent.docker_hub_pwd # agent-ci-experience
E2E_TESTS_API_KEY_SSM_NAME: ci.datadog-agent.e2e_tests_api_key # agent-developer-tools
E2E_TESTS_APP_KEY_SSM_NAME: ci.datadog-agent.e2e_tests_app_key # agent-developer-tools
E2E_TESTS_RC_KEY_SSM_NAME: ci.datadog-agent.e2e_tests_rc_key # agent-developer-tools
KITCHEN_EC2_SSH_KEY_SSM_NAME: ci.datadog-agent.aws_ec2_kitchen_ssh_key # agent-developer-tools
KITCHEN_AZURE_CLIENT_ID_SSM_NAME: ci.datadog-agent.azure_kitchen_client_id # agent-developer-tools
KITCHEN_AZURE_CLIENT_SECRET_SSM_NAME: ci.datadog-agent.azure_kitchen_client_secret # agent-developer-tools
KITCHEN_AZURE_SUBSCRIPTION_ID_SSM_NAME: ci.datadog-agent.azure_kitchen_subscription_id # agent-developer-tools
KITCHEN_AZURE_TENANT_ID_SSM_NAME: ci.datadog-agent.azure_kitchen_tenant_id # agent-developer-tools
GITLAB_SCHEDULER_TOKEN_SSM_NAME: ci.datadog-agent.gitlab_pipelines_scheduler_token # ci-cd
GITLAB_READ_API_TOKEN_SSM_NAME: ci.datadog-agent.gitlab_read_api_token # ci-cd
INSTALL_SCRIPT_API_KEY_SSM_NAME: ci.agent-linux-install-script.datadog_api_key # agent-build-and-release
JIRA_READ_API_TOKEN_SSM_NAME: ci.datadog-agent.jira_read_api_token # agent-ci-experience
MACOS_GITHUB_APP_ID_SSM_NAME: ci.datadog-agent.macos_github_app_id # agent-ci-experience
MACOS_GITHUB_INSTALLATION_ID_SSM_NAME: ci.datadog-agent.macos_github_installation_id # agent-ci-experience
MACOS_GITHUB_KEY_SSM_NAME: ci.datadog-agent.macos_github_key_b64 # agent-ci-experience
RPM_GPG_KEY_SSM_NAME: ci.datadog-agent.rpm_signing_private_key_v2_${RPM_GPG_KEY_ID} # agent-build-and-release
RPM_SIGNING_PASSPHRASE_SSM_NAME: ci.datadog-agent.rpm_signing_key_passphrase_v2_${RPM_GPG_KEY_ID} # agent-build-and-release
SMP_ACCOUNT_ID_SSM_NAME: ci.datadog-agent.single-machine-performance-account-id # single-machine-performance
SMP_AGENT_TEAM_ID_SSM_NAME: ci.datadog-agent.single-machine-performance-agent-team-id # single-machine-performance
SMP_API_SSM_NAME: ci.datadog-agent.single-machine-performance-api # single-machine-performance
SMP_BOT_ACCESS_KEY_SSM_NAME: ci.datadog-agent.single-machine-performance-bot-access-key # single-machine-performance
SMP_BOT_ACCESS_KEY_ID_SSM_NAME: ci.datadog-agent.single-machine-performance-bot-access-key-id # single-machine-performance
SSH_KEY_SSM_NAME: ci.datadog-agent.ssh_key # system-probe
SSH_KEY_RSA_SSM_NAME: ci.datadog-agent.ssh_key_rsa # agent-developer-tools
SSH_PUBLIC_KEY_RSA_SSM_NAME: ci.datadog-agent.ssh_public_key_rsa # agent-developer-tools
VCPKG_BLOB_SAS_URL_SSM_NAME: ci.datadog-agent-buildimages.vcpkg_blob_sas_url # windows-agent
WINGET_PAT_SSM_NAME: ci.datadog-agent.winget_pat # windows-agent


# Job stage attempts (see https://docs.gitlab.com/ee/ci/runners/configure_runners.html#job-stages-attempts)
ARTIFACT_DOWNLOAD_ATTEMPTS: 2
Expand Down Expand Up @@ -1039,13 +1040,13 @@ workflow:

.if_windows_installer_changes: &if_windows_installer_changes
changes:
paths:
- tools/windows/DatadogAgentInstaller/**/*
- .gitlab/new-e2e_testing/windows.yml
- test/new-e2e/tests/windows/install-test/**/*
- test/new-e2e/tests/windows/domain-test/**/*
- tasks/msi.py
compare_to: main # TODO: use a variable, when this is supported https://gitlab.com/gitlab-org/gitlab/-/issues/369916
paths:
- tools/windows/DatadogAgentInstaller/**/*
- .gitlab/new-e2e_testing/windows.yml
- test/new-e2e/tests/windows/install-test/**/*
- test/new-e2e/tests/windows/domain-test/**/*
- tasks/msi.py
compare_to: main # TODO: use a variable, when this is supported https://gitlab.com/gitlab-org/gitlab/-/issues/369916

.on_windows_installer_changes_or_manual:
- <<: *if_disable_e2e_tests
Expand Down Expand Up @@ -1112,6 +1113,7 @@ workflow:

# New E2E related rules


.on_e2e_main_release_or_rc: # This rule is used as a base for all new-e2e rules
- <<: *if_disable_e2e_tests
when: never
Expand Down Expand Up @@ -1336,24 +1338,24 @@ workflow:
allow_failure: true

.on_updater_or_e2e_changes_or_manual:
# - <<: *if_disable_e2e_tests
# when: never
# - <<: *if_mergequeue
# when: never
# - <<: *if_main_branch
# when: on_success
# - <<: *if_release_branch
# when: on_success
# - if: $CI_COMMIT_TAG =~ /^[0-9]+\.[0-9]+\.[0-9]+-rc\.[0-9]+$/
# when: on_success
# - changes:
# paths:
# - pkg/updater/**/*
# - cmd/updater/**/*
# - test/new-e2e/tests/updater/**/*
# - test/new-e2e/go.mod
# compare_to: main # TODO: use a variable, when this is supported https://gitlab.com/gitlab-org/gitlab/-/issues/369916
# when: on_success
- <<: *if_disable_e2e_tests
when: never
- <<: *if_mergequeue
when: never
- <<: *if_main_branch
when: on_success
- <<: *if_release_branch
when: on_success
- if: $CI_COMMIT_TAG =~ /^[0-9]+\.[0-9]+\.[0-9]+-rc\.[0-9]+$/
when: on_success
- changes:
paths:
- pkg/updater/**/*
- cmd/updater/**/*
- test/new-e2e/tests/updater/**/*
- test/new-e2e/go.mod
compare_to: main # TODO: use a variable, when this is supported https://gitlab.com/gitlab-org/gitlab/-/issues/369916
when: on_success
- when: manual
allow_failure: true

Expand Down

0 comments on commit 0aba308

Please sign in to comment.