Remove references to CBL-Mariner in .github folder (#8613)

microsoft · Mar 29, 2024 · ba68462 · ba68462
1 parent 0a630fa
commit ba68462
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 13 deletions.
diff --git a/.github/workflows/check-clean-stage.yml b/.github/workflows/check-clean-stage.yml
@@ -42,7 +42,7 @@ jobs:
             if grep -q "^\s*%clean" "$spec"
             then
               1>&2 echo "**** ERROR ****"
-              1>&2 echo "Spec '$spec' contains a %clean stage, which should be unnecessary for CBL-Mariner. Please remove it or add an exception for this spec file."
+              1>&2 echo "Spec '$spec' contains a %clean stage, which should be unnecessary for Azure Linux. Please remove it or add an exception for this spec file."
               1>&2 echo "**** ERROR ****"
               error_found=1
             fi

diff --git a/.github/workflows/check-entangled-specs.yml b/.github/workflows/check-entangled-specs.yml
@@ -22,7 +22,7 @@ jobs:
       - name: Workflow trigger checkout
         uses: actions/checkout@v4
 
-      # For consistency, we use the same major/minor version of Python that CBL-Mariner ships
+      # For consistency, we use the same major/minor version of Python that Azure Linux ships
       - name: Setup Python 3.12
         uses: actions/setup-python@v5
         with:

diff --git a/.github/workflows/check-kernel-config.yml b/.github/workflows/check-kernel-config.yml
@@ -11,12 +11,12 @@ on:
     branches: [main, 1.0*, 2.0*, 3.0*, fasttrack/*]
     paths:
       - 'SPECS/kernel*/config*'
-      - toolkit/scripts/mariner-required-configs.json
+      - toolkit/scripts/os-required-configs.json
   pull_request:
     branches: [main, 1.0*, 2.0*, 3.0*, fasttrack/*]
     paths:
       - 'SPECS/kernel*/config*'
-      - toolkit/scripts/mariner-required-configs.json
+      - toolkit/scripts/os-required-configs.json
 
 jobs:
   check:
@@ -51,9 +51,9 @@ jobs:
         run: python3 -m pip install -r toolkit/scripts/requirements.txt
 
       # Check if the required configs file is sorted
-      - name: Check mariner-required-configs.json format
+      - name: Check os-required-configs.json format
         run:
-          python3 toolkit/scripts/check_required_config_fmt.py toolkit/scripts/mariner-required-configs.json
+          python3 toolkit/scripts/check_required_config_fmt.py toolkit/scripts/os-required-configs.json
 
       # Check if kernel configs changed
       - name: Check if config files changed
@@ -72,13 +72,13 @@ jobs:
           for file in $holder; do
             config_diff=$(git diff-tree -p -r ${{ env.base_sha }} ${{ github.sha }} -- ${file})
             echo "config_diff for ${file} : ${config_diff}"
-            python3 toolkit/scripts/check_new_kernel_configs.py --required_configs=toolkit/scripts/mariner-required-configs.json --config_file="${file}" --config_diff="${config_diff}"
+            python3 toolkit/scripts/check_new_kernel_configs.py --required_configs=toolkit/scripts/os-required-configs.json --config_file="${file}" --config_diff="${config_diff}"
           done
 
       # Check if required configs were removed or modified
       - name: Run kernel config checking script
         run: |
           holder="${{ env.updated_configs }}"
           for file in $holder; do
-            python3 toolkit/scripts/check_required_kernel_configs.py --required_configs toolkit/scripts/mariner-required-configs.json --config_file "${file}"
+            python3 toolkit/scripts/check_required_kernel_configs.py --required_configs toolkit/scripts/os-required-configs.json --config_file "${file}"
           done
diff --git a/.github/workflows/check-signatures.yml b/.github/workflows/check-signatures.yml
@@ -19,7 +19,7 @@ jobs:
       - name: Workflow trigger checkout
         uses: actions/checkout@v4
 
-      # For consistency, we use the same major/minor version of Python that CBL-Mariner ships
+      # For consistency, we use the same major/minor version of Python that Azure Linux ships
       - name: Setup Python 3.12
         uses: actions/setup-python@v5
         with:

diff --git a/.github/workflows/check-source-signatures.yml b/.github/workflows/check-source-signatures.yml
@@ -19,7 +19,7 @@ jobs:
       - name: Workflow trigger checkout
         uses: actions/checkout@v4
 
-      # For consistency, we use the same major/minor version of Python that CBL-Mariner ships
+      # For consistency, we use the same major/minor version of Python that Azure Linux ships
       - name: Setup Python 3.12
         uses: actions/setup-python@v5
         with:

diff --git a/.github/workflows/check-spec.yml b/.github/workflows/check-spec.yml
@@ -19,7 +19,7 @@ jobs:
       - name: Workflow trigger checkout
         uses: actions/checkout@v4
 
-      # For consistency, we use the same major/minor version of Python that CBL-Mariner ships
+      # For consistency, we use the same major/minor version of Python that Azure Linux ships
       - name: Setup Python 3.12
         uses: actions/setup-python@v5
         with:

diff --git a/.github/workflows/check-static-glibc.yml b/.github/workflows/check-static-glibc.yml
@@ -20,7 +20,7 @@ jobs:
       - name: Workflow trigger checkout
         uses: actions/checkout@v4
 
-      # For consistency, we use the same major/minor version of Python that CBL-Mariner ships
+      # For consistency, we use the same major/minor version of Python that Azure Linux ships
       - name: Setup Python 3.12
         uses: actions/setup-python@v5
         with:

diff --git a/...kit/scripts/mariner-required-configs.json → toolkit/scripts/os-required-configs.json b/...kit/scripts/mariner-required-configs.json → toolkit/scripts/os-required-configs.json
@@ -311,7 +311,7 @@
                     "AMD64",
                     "ARM64"
                 ],
-                "comment": "Enable CUSE to support Nvidia rshim interface for Mariner hosts",
+                "comment": "Enable CUSE to support Nvidia rshim interface for Azure Linux hosts",
                 "value": [
                     "m"
                 ]