Merge branch '3.0-dev' into 3.0

Author: jslobodzian

.github/workflows/check-package-update-gate.yml

@@ -0,0 +1,89 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+name: Check Package Update Gate
+
+on:
+  push:
+    branches: [main, 2.0*, 3.0*, fasttrack/*]
+  pull_request:
+    branches: [main, 2.0*, 3.0*, fasttrack/*]
+
+jobs:
+
+  build:
+    name: Check Package Update Gate
+    runs-on: ubuntu-latest
+    steps:
+
+    - name: Check out code
+      uses: actions/checkout@v4
+
+    - name: Get base commit for PRs
+      if: ${{ github.event_name == 'pull_request' }}
+      run: |
+        git fetch origin ${{ github.base_ref }}
+        echo "base_sha=$(git rev-parse origin/${{ github.base_ref }})" >> $GITHUB_ENV
+        echo "Merging ${{ github.sha }} into ${{ github.base_ref }}"
+
+    - name: Get base commit for Pushes
+      if: ${{ github.event_name == 'push' }}
+      run: |
+        git fetch origin ${{ github.event.before }}
+        echo "base_sha=${{ github.event.before }}" >> $GITHUB_ENV
+        echo "Merging ${{ github.sha }} into ${{ github.event.before }}"
+
+    - name: Get the changed files
+      run: |
+        echo "Files changed: '$(git diff-tree --no-commit-id --name-only -r ${{ env.base_sha }} ${{ github.sha }})'"
+        changed_specs=$(git diff-tree --diff-filter=d  --no-commit-id --name-only -r ${{ env.base_sha }} ${{ github.sha }} | { grep "SPECS.*/.*\.spec$" || test $? = 1; })
+        echo "Files to validate: '${changed_specs}'"
+        echo "updated-specs=$(echo ${changed_specs})" >> $GITHUB_ENV
+
+    - name: Check each spec
+      run: |
+
+        if [[ -z "${{ env.updated-specs }}" ]]; then
+          echo "No spec files to validate. Exiting."
+          exit 0
+        fi
+
+        for spec in ${{ env.updated-specs }}
+          do
+            echo "Checking '$spec'."
+            # Expand macros if present
+            name=$(rpmspec --parse "$spec" | grep -E "^Name:\s*(.*)" | awk '{print $2}')
+            version=$(rpmspec --parse "$spec" | grep -E "^Version:\s*(.*)" | awk '{print $2}')
+
+            # Read from packagelist-gate.csv and iterate each row
+            # 1st column: package name
+            # 2nd column: condition (>=, =,'')
+            # 3rd column: version number
+            
+            while IFS=, read -r package_name condition version_number; do
+              if [[ "$name" == "$package_name" ]]; then
+                  case "$condition" in
+                      ">=" | "=" )
+                          if [[ ("$condition" == ">=" && "$(printf '%s\n' "$version" "$version_number" | sort -V | head -n1)" == "$version_number") ||
+                                ("$condition" == "=" && "$version" == "$version_number") ]]; then
+                              1>&2 echo "**** ERROR ****"
+                              1>&2 echo "Spec '$spec' version '$version' is not allowed in Azure Linux. Error:'$spec $condition $version_number'."
+                              1>&2 echo "**** ERROR ****"
+                              error_found=1
+                          fi
+                          ;;
+                      *)
+                          1>&2 echo "**** ERROR ****"
+                          1>&2 echo "Spec $spec is not allowed in Azure Linux"
+                          1>&2 echo "**** ERROR ****"
+                          error_found=1
+                          ;;
+                  esac
+              fi
+            done < .github/workflows/packagelist-gate.csv  
+          done
+
+        if [[ -n $error_found ]]
+        then
+          exit 1
+        fi

.github/workflows/packagelist-gate.csv

@@ -0,0 +1,6 @@
+fdk-aac-free,,
+opus,,
+opus-file,,
+packer,>=,1.10.0
+redis,>=,7.4
+terraform,>=,1.6.0

.pipelines/containerSourceData/scripts/BuildBaseContainers.sh

@@ -47,7 +47,7 @@ set -e
 #    -r "" \
 #    -q "false"
 
-while getopts ":a:c:k:l:o:p:r:q:" OPTIONS; do
+while getopts ":a:c:k:l:o:p:r:q:s:t:u:v:" OPTIONS; do
     case ${OPTIONS} in
     a ) ACR=$OPTARG;;
     c ) CONTAINER_TARBALLS_DIR=$OPTARG;;
@@ -57,6 +57,10 @@ while getopts ":a:c:k:l:o:p:r:q:" OPTIONS; do
     p ) PUBLISHING_LEVEL=$OPTARG;;
     r ) REPO_PREFIX=$OPTARG;;
     q ) PUBLISH_TO_ACR=$OPTARG;;
+    s ) DISTROLESS_BASE_BUILD=$OPTARG;;
+    t ) DISTROLESS_DEBUG_BUILD=$OPTARG;; 
+    u ) DISTROLESS_MINIMAL_BUILD=$OPTARG;;
+    v ) BASE_BUILD=$OPTARG;;
 
     \? )
         echo "Error - Invalid Option: -$OPTARG" 1>&2
@@ -86,6 +90,10 @@ function print_inputs {
     echo "PUBLISHING_LEVEL              -> $PUBLISHING_LEVEL"
     echo "PUBLISH_TO_ACR                -> $PUBLISH_TO_ACR"
     echo "OUTPUT_DIR                    -> $OUTPUT_DIR"
+    echo "DISTROLESS_BASE_BUILD         -> $DISTROLESS_BASE_BUILD"
+    echo "DISTROLESS_DEBUG_BUILD        -> $DISTROLESS_DEBUG_BUILD"
+    echo "DISTROLESS_MINIMAL_BUILD      -> $DISTROLESS_MINIMAL_BUILD"
+    echo "BASE_BUILD                    -> $BASE_BUILD"
 }
 
 function validate_inputs {
@@ -104,10 +112,17 @@ function validate_inputs {
     DISTROLESS_BASE_TARBALL=$(find "$CONTAINER_TARBALLS_DIR" -name "distroless-base-[0-9.]*.tar.gz")
     DISTROLESS_DEBUG_TARBALL=$(find "$CONTAINER_TARBALLS_DIR" -name "distroless-debug-[0-9.]*.tar.gz")
     DISTROLESS_MINIMAL_TARBALL=$(find "$CONTAINER_TARBALLS_DIR" -name "distroless-minimal-[0-9.]*.tar.gz")
-    if [[ (! -f $BASE_TARBALL)  || \
-        (! -f $DISTROLESS_BASE_TARBALL) || \
-        (! -f $DISTROLESS_DEBUG_TARBALL) || \
-        (! -f $DISTROLESS_MINIMAL_TARBALL) ]]; then
+    
+    # Give default values for when the variables are not set (non fasttrack builds).
+    BASE_BUILD=${BASE_BUILD:-true}
+    DISTROLESS_BASE_BUILD=${DISTROLESS_BASE_BUILD:-true}
+    DISTROLESS_DEBUG_BUILD=${DISTROLESS_DEBUG_BUILD:-true}
+    DISTROLESS_MINIMAL_BUILD=${DISTROLESS_MINIMAL_BUILD:-true}
+
+    if [[ ($BASE_BUILD =~ [Tt]rue && ! -f $BASE_TARBALL) || \
+      ($DISTROLESS_BASE_BUILD =~ [Tt]rue  && ! -f $DISTROLESS_BASE_TARBALL) || \
+      ($DISTROLESS_DEBUG_BUILD =~ [Tt]rue && ! -f $DISTROLESS_DEBUG_TARBALL) || \
+      ($DISTROLESS_MINIMAL_BUILD =~ [Tt]rue && ! -f $DISTROLESS_MINIMAL_TARBALL) ]]; then
         echo "Error - Missing some tarball(s) in $CONTAINER_TARBALLS_DIR"
         exit 1
     fi
@@ -191,6 +206,10 @@ function initialization {
     echo "DISTROLESS_MINIMAL_IMAGE_NAME         -> $DISTROLESS_MINIMAL_IMAGE_NAME"
     echo "DISTROLESS_DEBUG_IMAGE_NAME           -> $DISTROLESS_DEBUG_IMAGE_NAME"
     echo "MARINARA_IMAGE_NAME                   -> $MARINARA_IMAGE_NAME"
+    echo "DISTROLESS_BASE_BUILD                 -> $DISTROLESS_BASE_BUILD"
+    echo "DISTROLESS_DEBUG_BUILD                -> $DISTROLESS_DEBUG_BUILD"
+    echo "DISTROLESS_MINIMAL_BUILD              -> $DISTROLESS_MINIMAL_BUILD"
+    echo "BASE_BUILD                            -> $BASE_BUILD"
 
     ROOT_FOLDER="$(git rev-parse --show-toplevel)"
     EULA_FILE_PATH="$ROOT_FOLDER/.pipelines/container_artifacts/data"
@@ -208,6 +227,12 @@ function docker_build {
     local image_full_name=$2
     local image_tarball=$3
     local dockerfile=$4
+    local should_build=$5
+
+    if [[ $should_build =~ [Ff]alse ]]; then
+        echo "+++ Skip building image- Fasttrack: $image_full_name"
+        return
+    fi
 
     echo "+++ Importing container image: $image_full_name"
     local temp_image=${image_full_name}_temp
@@ -308,10 +333,10 @@ function save_container_image {
 
 function build_images {
     echo "+++ Build images"
-    docker_build $BASE "$BASE_IMAGE_NAME" "$BASE_TARBALL" "Dockerfile-Base-Template"
-    docker_build $DISTROLESS "$DISTROLESS_BASE_IMAGE_NAME" "$DISTROLESS_BASE_TARBALL" "Dockerfile-Distroless-Template"
-    docker_build $DISTROLESS "$DISTROLESS_MINIMAL_IMAGE_NAME" "$DISTROLESS_MINIMAL_TARBALL" "Dockerfile-Distroless-Template"
-    docker_build $DISTROLESS "$DISTROLESS_DEBUG_IMAGE_NAME" "$DISTROLESS_DEBUG_TARBALL" "Dockerfile-Distroless-Template"
+    docker_build $BASE "$BASE_IMAGE_NAME" "$BASE_TARBALL" "Dockerfile-Base-Template" "$BASE_BUILD"
+    docker_build $DISTROLESS "$DISTROLESS_BASE_IMAGE_NAME" "$DISTROLESS_BASE_TARBALL" "Dockerfile-Distroless-Template" "$DISTROLESS_BASE_BUILD"
+    docker_build $DISTROLESS "$DISTROLESS_MINIMAL_IMAGE_NAME" "$DISTROLESS_MINIMAL_TARBALL" "Dockerfile-Distroless-Template" "$DISTROLESS_MINIMAL_BUILD"
+    docker_build $DISTROLESS "$DISTROLESS_DEBUG_IMAGE_NAME" "$DISTROLESS_DEBUG_TARBALL" "Dockerfile-Distroless-Template" "$DISTROLESS_DEBUG_BUILD"
     docker_build_marinara
 }
 

LICENSES-AND-NOTICES/SPECS/LICENSES-MAP.md

@@ -227,9 +227,9 @@
                 "fftw",
                 "filebench",
                 "fio",
-                "fipscheck",
                 "firewalld",
                 "flac",
+                "flashrom",
                 "flatbuffers",
                 "flite",
                 "fltk",
@@ -253,6 +253,8 @@
                 "fuse-zip",
                 "fuse3",
                 "future",
+                "fwupd",
+                "fwupd-efi",
                 "fxload",
                 "gavl",
                 "gbenchmark",
@@ -272,6 +274,7 @@
                 "geos",
                 "gfs2-utils",
                 "ghc-srpm-macros",
+                "gi-docgen",
                 "giflib",
                 "gl-manpages",
                 "glew",
@@ -592,6 +595,7 @@
                 "libbytesize",
                 "libcacard",
                 "libcanberra",
+                "libcbor",
                 "libcdio",
                 "libcdio-paranoia",
                 "libcdr",
@@ -675,6 +679,7 @@
                 "libiscsi",
                 "libisoburn",
                 "libisofs",
+                "libjaylink",
                 "libjcat",
                 "libkcapi",
                 "libkeepalive",
@@ -780,6 +785,7 @@
                 "libunicap",
                 "libuninameslist",
                 "liburing",
+                "libusb1",
                 "libusbmuxd",
                 "libuser",
                 "libutempter",
@@ -1090,6 +1096,7 @@
                 "papi",
                 "paps",
                 "parallel",
+                "passim",
                 "patchelf",
                 "patchutils",
                 "pbzip2",
@@ -1646,7 +1653,9 @@
                 "python-betamax",
                 "python-blinker",
                 "python-blivet",
+                "python-breathe",
                 "python-cached_property",
+                "python-cbor2",
                 "python-charset-normalizer",
                 "python-cheetah",
                 "python-click",
@@ -1814,6 +1823,7 @@
                 "python-should_dsl",
                 "python-simpleline",
                 "python-slip",
+                "python-smartypants",
                 "python-sniffio",
                 "python-sortedcontainers",
                 "python-soupsieve",
@@ -1826,6 +1836,7 @@
                 "python-sphinxcontrib-devhelp",
                 "python-sphinxcontrib-htmlhelp",
                 "python-sphinxcontrib-httpdomain",
+                "python-sphinxcontrib-jquery",
                 "python-sphinxcontrib-jsmath",
                 "python-sphinxcontrib-qthelp",
                 "python-sphinxcontrib-serializinghtml",
@@ -1850,10 +1861,12 @@
                 "python-trio",
                 "python-trove-classifiers",
                 "python-typing-extensions",
+                "python-typogrify",
                 "python-uamqp",
                 "python-unittest2",
                 "python-uritemplate",
                 "python-urwid",
+                "python-uswid",
                 "python-varlink",
                 "python-versioneer",
                 "python-virt-firmware",
@@ -2069,6 +2082,7 @@
                 "udisks2",
                 "uglify-js",
                 "uid_wrapper",
+                "umockdev",
                 "unicode-emoji",
                 "unicode-ucd",
                 "unique3",
@@ -2232,6 +2246,7 @@
                 "docker-compose",
                 "doxygen",
                 "dtc",
+                "edk2-hvloader-signed",
                 "elixir",
                 "espeak-ng",
                 "espeakup",
@@ -2256,6 +2271,7 @@
                 "keda",
                 "keras",
                 "kernel-64k-signed",
+                "kernel-mshv-signed",
                 "kernel-signed",
                 "kernel-uki",
                 "kernel-uki-signed",
@@ -2559,7 +2575,6 @@
                 "gnu-regexp",
                 "golang-packaging",
                 "guava",
-                "guava20",
                 "hamcrest",
                 "hawtjni-runtime",
                 "httpcomponents-core",

LICENSES-AND-NOTICES/SPECS/data/licenses.json

@@ -1,5 +1,5 @@
 {
  "Signatures": {
-  "PEGTL-2.8.3.tar.gz": "88b8e4ded6ea1f3f2223cc3e37072e2db1e123b90d36c309816341ae9d966723"
+  "PEGTL-3.2.8.tar.gz": "319e8238daebc3a163f60c88c78922a8012772076fdd64a8dafaf5619cd64773"
  }
 }