diff --git a/configs/aws_ec2_plugin.yaml b/configs/aws_ec2_plugin.yaml index 9509f7a..a879182 100644 --- a/configs/aws_ec2_plugin.yaml +++ b/configs/aws_ec2_plugin.yaml @@ -89,49 +89,6 @@ jenkins: type: C54xlarge useEphemeralDevices: false zone: "us-west-2a" - - ami: "ami-07e0caede54ba0c81" - amiType: - unixData: - sshPort: "22" - associatePublicIp: false - connectBySSHProcess: false - connectionStrategy: PRIVATE_IP - deleteRootOnTermination: false - description: "MARS_PUBLISH_1" - ebsEncryptRootVolume: ENCRYPTED - ebsOptimized: true - hostKeyVerificationStrategy: ACCEPT_NEW - iamInstanceProfile: "arn:aws:iam::${/jenkins/config/accountid}:instance-profile/jenkins-build-node" - idleTerminationMinutes: "30" - instanceCapStr: "1" - labelString: "metrics" - launchTimeoutStr: "300" - maxTotalUses: -1 - metadataEndpointEnabled: true - metadataHopsLimit: 1 - metadataTokensRequired: false - minimumNumberOfInstances: 0 - minimumNumberOfSpareInstances: 0 - mode: EXCLUSIVE - monitoring: false - numExecutors: 1 - remoteAdmin: "lybuilder" - remoteFS: "/home/lybuilder/ly" - securityGroups: "sg-0551df0efb1ca5476" - stopOnTerminate: true - subnetId: "subnet-c111be8b" - t2Unlimited: false - tags: - - name: "Name" - value: "MARS_PUBLISH_1" - tenancy: Default - type: C5aLarge - useEphemeralDevices: false - userData: |- - #!/bin/bash - sudo systemctl enable filebeat-prod filebeat-sandbox - sudo systemctl start filebeat-prod filebeat-sandbox - zone: "us-west-2a" - ami: "ami-0a3584277984128ca" amiType: unixData: diff --git a/configs/credentials.yaml b/configs/credentials.yaml index 462acf6..40886a3 100644 --- a/configs/credentials.yaml +++ b/configs/credentials.yaml @@ -18,11 +18,6 @@ credentials: password: ${/jenkins/config/github/token} scope: GLOBAL username: ${/jenkins/config/github/username} - - usernamePassword: - id: "jenkins-service-user" - password: ${/jenkins/config/serviceuser/token} - scope: GLOBAL - username: ${/jenkins/config/serviceuser/username} - usernamePassword: id: "build-failure-rca-kb" password: ${/jenkins/config/buildFailureDB/password} diff --git a/configs/global_env_var.yaml b/configs/global_env_var.yaml index a8e4020..985945b 100644 --- a/configs/global_env_var.yaml +++ b/configs/global_env_var.yaml @@ -7,12 +7,8 @@ jenkins: value: "development" - key: "CPACK_UPLOAD_URL" value: "s3://o3de-prism-prod-us-west-2" - - key: "D_MARS_NOTIFICATIONS" - value: ${/jenkins/config/mars/notification} - key: "DEFAULT_REPOSITORY_NAME" value: "o3de" - - key: "ES_HOSTS" - value: "\"https://prod.mars.agscollab.com:443\"" - key: "GITHUB_USER" value: "o3de-ci-bot" - key: "INSTALLER_DOWNLOAD_URL" @@ -29,8 +25,6 @@ jenkins: value: "d3df09qsjufr6g.cloudfront.net/api/v1" - key: "LY_PACKAGE_SERVER_URLS" value: "s3://o3de-prod-3p-packages;" - - key: "MARS_REPO" - value: "https://github.com/aws-lumberyard/o3de-mars.git" - key: "POST_AR_BUILD_SNS_TOPIC" value: "arn:aws:sns:us-west-2:${/jenkins/config/accountid}:post-ar-build" - key: "SERVICE_USER" diff --git a/configs/jobs.yaml b/configs/jobs.yaml index d383fb7..6fef183 100644 --- a/configs/jobs.yaml +++ b/configs/jobs.yaml @@ -13,7 +13,6 @@ jobs: # Tools - file: ${JENKINS_LOCAL}/jobdsl/default_development_snapshot.groovy - file: ${JENKINS_LOCAL}/jobdsl/Installer.groovy - - file: ${JENKINS_LOCAL}/jobdsl/mars_metrics.groovy - file: ${JENKINS_LOCAL}/jobdsl/override_pr_status_check.groovy - file: ${JENKINS_LOCAL}/jobdsl/periodic_incremental_daily_development_trigger.groovy - file: ${JENKINS_LOCAL}/jobdsl/periodic_incremental_daily_stabilization_trigger.groovy diff --git a/configs/views.yaml b/configs/views.yaml index f671066..98130ce 100644 --- a/configs/views.yaml +++ b/configs/views.yaml @@ -28,7 +28,6 @@ jenkins: jobNames: - "default-development_snapshot" - "Installer" - - "MARS Metrics" - "O3DE-development_nightly-installer" - "O3DE-test_nightly-installer" - "override-pr-status-check" diff --git a/jobdsl/mars_metrics.groovy b/jobdsl/mars_metrics.groovy deleted file mode 100644 index 9931dfa..0000000 --- a/jobdsl/mars_metrics.groovy +++ /dev/null @@ -1,45 +0,0 @@ -multibranchPipelineJob('MARS METRICS') { - branchSources { - branchSource { - source { - github { - id('MARS-METRICS-GitHub') - configuredByUrl(false) - credentialsId('o3de-ci-bot') - repoOwner('aws-lumberyard') - repository('o3de-mars') - repositoryUrl('https://github.com/aws-lumberyard/o3de-mars.git') - traits { - authorInChangelogTrait() - gitHubBranchDiscovery { - strategyId(1) - } - pruneStaleBranchTrait() - pruneStaleTagTrait() - } - } - } - strategy { - allBranchesSame { - props { - suppressAutomaticTriggering { - triggeredBranchesRegex('^$') - } - } - } - } - } - } - displayName('MARS Metrics') - factory { - workflowBranchProjectFactory { - scriptPath('Jenkinsfile') - } - } - orphanedItemStrategy { - discardOldItems { - daysToKeep(7) - numToKeep(100) - } - } -}