diff --git a/.gitlab/deploy_packages/nix.yml b/.gitlab/deploy_packages/nix.yml index 3c414a0202593..f73178347c59c 100644 --- a/.gitlab/deploy_packages/nix.yml +++ b/.gitlab/deploy_packages/nix.yml @@ -38,9 +38,3 @@ deploy_packages_suse_rpm-x64-6: needs: [ agent_suse-x64-a6 ] variables: PACKAGE_ARCH: x86_64 - -deploy_packages_suse_rpm-arm64-6: - extends: .deploy_packages_suse_rpm-6 - needs: [ agent_suse-arm64-a6 ] - variables: - PACKAGE_ARCH: aarch64 diff --git a/.gitlab/kitchen_deploy/kitchen_deploy.yml b/.gitlab/kitchen_deploy/kitchen_deploy.yml index 0d38070fcf825..fae93300ca87c 100644 --- a/.gitlab/kitchen_deploy/kitchen_deploy.yml +++ b/.gitlab/kitchen_deploy/kitchen_deploy.yml @@ -156,25 +156,6 @@ deploy_suse_rpm_testing_x64-a6: - set +x - echo "$RPM_SIGNING_PASSPHRASE" | rpm-s3 --verbose --visibility public-read -c "https://s3.amazonaws.com" -b $RPM_TESTING_S3_BUCKET -p "suse/testing/pipeline-$DD_PIPELINE_ID/6/x86_64/" -a "x86_64" --sign --metadata-signing-key $RPM_GPG_KEY_ID --repodata-store-public-key $OMNIBUS_PACKAGE_DIR_SUSE/datadog-*-6.*x86_64.rpm -deploy_suse_rpm_testing_arm64-a6: - rules: - - !reference [.on_kitchen_tests] - - !reference [.on_installer_or_e2e_changes] - - !reference [.manual] - stage: kitchen_deploy - image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/datadog-agent-builders/gitlab_agent_deploy:$DATADOG_AGENT_BUILDERS - tags: ["arch:amd64"] - needs: ["agent_suse-arm64-a6", "lint_linux-arm64"] - variables: - DD_PIPELINE_ID: $CI_PIPELINE_ID-a6 - before_script: - - source /root/.bashrc - - ls $OMNIBUS_PACKAGE_DIR_SUSE - script: - - *setup_rpm_signing_key - - set +x - - echo "$RPM_SIGNING_PASSPHRASE" | rpm-s3 --verbose --visibility public-read -c "https://s3.amazonaws.com" -b $RPM_TESTING_S3_BUCKET -p "suse/testing/pipeline-$DD_PIPELINE_ID/6/aarch64/" -a "aarch64" --sign --metadata-signing-key $RPM_GPG_KEY_ID --repodata-store-public-key $OMNIBUS_PACKAGE_DIR_SUSE/datadog-*-6.*aarch64.rpm - deploy_windows_testing-a6: rules: - !reference [.except_no_tests_no_deploy] diff --git a/.gitlab/kitchen_testing/new-e2e_testing/suse.yml b/.gitlab/kitchen_testing/new-e2e_testing/suse.yml index 14b7d505186f5..fcbed0cc9945a 100644 --- a/.gitlab/kitchen_testing/new-e2e_testing/suse.yml +++ b/.gitlab/kitchen_testing/new-e2e_testing/suse.yml @@ -16,14 +16,6 @@ E2E_BRANCH_OSVERS: "sles-15" needs: ["deploy_suse_rpm_testing_x64-a6"] -.new-e2e_suse_a6_arm64: - variables: - E2E_ARCH: arm64 - E2E_OSVERS: "sles-15" - E2E_CWS_SUPPORTED_OSVERS: "sles-15" - E2E_BRANCH_OSVERS: "sles-15" - needs: ["deploy_suse_rpm_testing_arm64-a6"] - new-e2e-agent-platform-install-script-suse-a6-x86_64: stage: kitchen_testing extends: @@ -35,17 +27,6 @@ new-e2e-agent-platform-install-script-suse-a6-x86_64: variables: FLAVOR: datadog-agent -new-e2e-agent-platform-install-script-suse-a6-arm64: - stage: kitchen_testing - extends: - - .new_e2e_template - - .new-e2e_install_script - - .new-e2e_os_suse - - .new-e2e_suse_a6_arm64 - - .new-e2e_agent_a6 - variables: - FLAVOR: datadog-agent - new-e2e-agent-platform-package-signing-suse-a6-x86_64: stage: kitchen_testing extends: @@ -67,19 +48,6 @@ new-e2e-agent-platform-step-by-step-suse-a6-x86_64: variables: FLAVOR: datadog-agent -new-e2e-agent-platform-step-by-step-suse-a6-arm64: - stage: kitchen_testing - extends: - - .new_e2e_template - - .new-e2e_step_by_step - - .new-e2e_os_suse - - .new-e2e_suse_a6_arm64 - - .new-e2e_agent_a6 - rules: - !reference [.on_deploy] - variables: - FLAVOR: datadog-agent - new-e2e-agent-platform-install-script-upgrade6-suse-x86_64: stage: kitchen_testing extends: diff --git a/.gitlab/package_build/suse_rpm.yml b/.gitlab/package_build/suse_rpm.yml index 914ec377820e9..06fb95e74c0e4 100644 --- a/.gitlab/package_build/suse_rpm.yml +++ b/.gitlab/package_build/suse_rpm.yml @@ -56,29 +56,3 @@ agent_suse-x64-a6: before_script: - source /root/.bashrc - export RELEASE_VERSION=$RELEASE_VERSION_6 - -# build Agent package for suse-arm64 -# This is a bit hackish and mostly mimics the CentOS7/arm64 build -agent_suse-arm64-a6: - extends: .agent_build_common_suse_rpm - rules: - - !reference [.except_mergequeue] - - when: on_success - stage: package_build - image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/datadog-agent-buildimages/rpm_arm64$DATADOG_AGENT_ARMBUILDIMAGES_SUFFIX:$DATADOG_AGENT_ARMBUILDIMAGES - tags: ["arch:arm64"] - needs: - [ - "go_mod_tidy_check", - "build_system-probe-arm64", - "go_deps", - "generate_minimized_btfs_arm64", - ] - variables: - AGENT_MAJOR_VERSION: 6 - PYTHON_RUNTIMES: "3" - PACKAGE_ARCH: arm64 - OMNIBUS_TASK_EXTRA_PARAMS: "--host-distribution=suse" - before_script: - - source /root/.bashrc - - export RELEASE_VERSION=$RELEASE_VERSION_6