[21.3] Remove unused CI configs (#8091)

* Remove unused CI configs * Fix CUSTOM_REVISION var * Fix template jobs * Update all agents to latest * Use correct bokken images across the board
Unity-Technologies · Aug 20, 2024 · d74b088 · d74b088
1 parent 614ea40
commit d74b088
Show file tree

Hide file tree

Showing 10 changed files with 53 additions and 855 deletions.
diff --git a/.yamato/_abv.yml b/.yamato/_abv.yml
@@ -2,16 +2,13 @@
 # This file is generated by ant_yaml_generation package, don't edit this file manually.
 # Introduce any changes under .yamato/config/*.metafile files and rerun yaml-generation (or check #devs-automation-tooling).
 
-{% metadata_file .yamato/_cache_config.metafile -%}
-{% metadata_file .yamato/_latest_editor_versions_2021.3.metafile -%}
 
 ---
 
 graphics_repo_nightly_2021.3:
     name: Pack & Test all templates on 2021.3
     variables:
-        CACHE_ARGS: '{{cache.flags}}'
-        CUSTOM_REVISION: '{{2021_3.changeset.id}}'
+        CUSTOM_REVISION: '2021.3'
         TEST_FILTER: .*
         UTR_VERSION: "current"
     triggers:
@@ -21,13 +18,3 @@ graphics_repo_nightly_2021.3:
     dependencies:
       -  path: .yamato/_templates.yml#all_template_ci_2021.3
          rerun: on_new_revision
-graphics_repo_nightly_CUSTOM-REVISION:
-    name: Pack & Test all templates on CUSTOM-REVISION
-    variables:
-        CACHE_ARGS: '{{cache.flags}}'
-        CUSTOM_REVISION: custom_revision_not_set
-        TEST_FILTER: .*
-        UTR_VERSION: "current"
-    dependencies:
-      -  path: .yamato/_templates.yml#all_template_ci_CUSTOM-REVISION
-         rerun: on_new_revision
diff --git a/.yamato/_cache_config.metafile b/.yamato/_cache_config.metafile
diff --git a/.yamato/_editor_pinning.yml b/.yamato/_editor_pinning.yml
diff --git a/.yamato/_editor_priming.yml b/.yamato/_editor_priming.yml
@@ -2,46 +2,18 @@
 # This file is generated by ant_yaml_generation package, don't edit this file manually.
 # Introduce any changes under .yamato/config/*.metafile files and rerun yaml-generation (or check #devs-automation-tooling).
 
-{% metadata_file .yamato/_cache_config.metafile -%}
-{% metadata_file .yamato/_latest_editor_versions_2021.3.metafile -%}
 
 ---
 
 editor:priming:2021.3:Win:
     name: '[2021.3,Win] Editor priming'
     agent:
         type: Unity::VM
-        image: package-ci/ubuntu:v2.0.0-947723
+        image: package-ci/ubuntu-22.04:v4
         flavor: b1.small
     skip_checkout: true
     variables:
-        CUSTOM_REVISION: '{{2021_3.changeset.id}}'
-        DISPLAY: ":0"
-        PATH: /home/bokken/bin:/home/bokken/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/sbin:/home/bokken/.npm-global/bin
-        UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
-    commands:
-      -  sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}*
-      -  curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add -
-      -  sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list"
-      -  sudo apt update
-      -  sudo apt install unity-downloader-cli
-      -  unity-downloader-cli -u $CUSTOM_REVISION -o windows --wait --skip-download -c editor -c il2cpp  > unity_revision.txt
-    artifacts:
-        revisions:
-            paths:
-              -  "unity_revision.txt"
-editor:priming:CUSTOM-REVISION:Win:
-    name: '[CUSTOM-REVISION,Win] Editor priming'
-    agent:
-        type: Unity::VM
-        image: package-ci/ubuntu:v2.0.0-947723
-        flavor: b1.small
-    skip_checkout: true
-    variables:
-        CUSTOM_REVISION: custom_revision_not_set
-        DISPLAY: ":0"
-        PATH: /home/bokken/bin:/home/bokken/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/sbin:/home/bokken/.npm-global/bin
-        UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
+        CUSTOM_REVISION: '2021.3'
     commands:
       -  sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}*
       -  curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add -
@@ -57,7 +29,7 @@ editor:priming:test_min_editor:Win:
     name: '[Min_Editor,Win] Editor priming'
     agent:
         type: Unity::VM
-        image: package-ci/ubuntu:v2.0.0-947723
+        image: automation-tooling/macos-11:v2.1987114
         flavor: b1.small
     variables:
         DISPLAY: ":0"
@@ -80,37 +52,11 @@ editor:priming:2021.3:OSX:
     name: '[2021.3,OSX] Editor priming'
     agent:
         type: Unity::VM
-        image: package-ci/ubuntu:v2.0.0-947723
-        flavor: b1.small
-    skip_checkout: true
-    variables:
-        CUSTOM_REVISION: '{{2021_3.changeset.id}}'
-        DISPLAY: ":0"
-        PATH: /home/bokken/bin:/home/bokken/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/sbin:/home/bokken/.npm-global/bin
-        UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
-    commands:
-      -  sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}*
-      -  curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add -
-      -  sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list"
-      -  sudo apt update
-      -  sudo apt install unity-downloader-cli
-      -  unity-downloader-cli -u $CUSTOM_REVISION -o macos --wait --skip-download -c editor -c il2cpp  > unity_revision.txt
-    artifacts:
-        revisions:
-            paths:
-              -  "unity_revision.txt"
-editor:priming:CUSTOM-REVISION:OSX:
-    name: '[CUSTOM-REVISION,OSX] Editor priming'
-    agent:
-        type: Unity::VM
-        image: package-ci/ubuntu:v2.0.0-947723
+        image: package-ci/ubuntu-22.04:v4
         flavor: b1.small
     skip_checkout: true
     variables:
-        CUSTOM_REVISION: custom_revision_not_set
-        DISPLAY: ":0"
-        PATH: /home/bokken/bin:/home/bokken/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/sbin:/home/bokken/.npm-global/bin
-        UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
+        CUSTOM_REVISION: '2021.3'
     commands:
       -  sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}*
       -  curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add -
@@ -126,7 +72,7 @@ editor:priming:test_min_editor:OSX:
     name: '[Min_Editor,OSX] Editor priming'
     agent:
         type: Unity::VM
-        image: package-ci/ubuntu:v2.0.0-947723
+        image: automation-tooling/macos-11:v2.1987114
         flavor: b1.small
     variables:
         DISPLAY: ":0"
@@ -149,37 +95,11 @@ editor:priming:2021.3:Linux:
     name: '[2021.3,Linux] Editor priming'
     agent:
         type: Unity::VM
-        image: package-ci/ubuntu:v2.0.0-947723
+        image: package-ci/ubuntu-22.04:v4
         flavor: b1.small
     skip_checkout: true
     variables:
-        CUSTOM_REVISION: '{{2021_3.changeset.id}}'
-        DISPLAY: ":0"
-        PATH: /home/bokken/bin:/home/bokken/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/sbin:/home/bokken/.npm-global/bin
-        UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
-    commands:
-      -  sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}*
-      -  curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add -
-      -  sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list"
-      -  sudo apt update
-      -  sudo apt install unity-downloader-cli
-      -  unity-downloader-cli -u $CUSTOM_REVISION -o linux --wait --skip-download -c editor -c il2cpp  > unity_revision.txt
-    artifacts:
-        revisions:
-            paths:
-              -  "unity_revision.txt"
-editor:priming:CUSTOM-REVISION:Linux:
-    name: '[CUSTOM-REVISION,Linux] Editor priming'
-    agent:
-        type: Unity::VM
-        image: package-ci/ubuntu:v2.0.0-947723
-        flavor: b1.small
-    skip_checkout: true
-    variables:
-        CUSTOM_REVISION: custom_revision_not_set
-        DISPLAY: ":0"
-        PATH: /home/bokken/bin:/home/bokken/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/sbin:/home/bokken/.npm-global/bin
-        UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
+        CUSTOM_REVISION: '2021.3'
     commands:
       -  sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}*
       -  curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add -
@@ -195,7 +115,7 @@ editor:priming:test_min_editor:Linux:
     name: '[Min_Editor,Linux] Editor priming'
     agent:
         type: Unity::VM
-        image: package-ci/ubuntu:v2.0.0-947723
+        image: automation-tooling/macos-11:v2.1987114
         flavor: b1.small
     variables:
         DISPLAY: ":0"

diff --git a/.yamato/_formatting.yml b/.yamato/_formatting.yml
diff --git a/.yamato/_latest_editor_versions_2021.3.metafile b/.yamato/_latest_editor_versions_2021.3.metafile