Merge branch 'fasttrack/3.0' into kevin-b-lockwood/ceph-CVE-2012-2677

.CodeQL.yml

@@ -0,0 +1,29 @@
+path_classifiers:
+  library:
+    # Treat source files for all compiled languages in the specs directories
+    # as 3rd party library sources because they are not owned by us.
+    #
+    # Extensions from https://codeql.github.com/docs/codeql-overview/supported-languages-and-frameworks/.
+    - "SPECS*/**/*.c"
+    - "SPECS*/**/*.c++"
+    - "SPECS*/**/*.cc"
+    - "SPECS*/**/*.cpp"
+    - "SPECS*/**/*.cs"
+    - "SPECS*/**/*.cshtml"
+    - "SPECS*/**/*.csproj"
+    - "SPECS*/**/*.cts"
+    - "SPECS*/**/*.cxx"
+    - "SPECS*/**/*.go"
+    - "SPECS*/**/*.h"
+    - "SPECS*/**/*.h++"
+    - "SPECS*/**/*.hh"
+    - "SPECS*/**/*.hpp"
+    - "SPECS*/**/*.hxx"
+    - "SPECS*/**/*.java"
+    - "SPECS*/**/*.kt"
+    - "SPECS*/**/*.mts"
+    - "SPECS*/**/*.sln"
+    - "SPECS*/**/*.swift"
+    - "SPECS*/**/*.ts"
+    - "SPECS*/**/*.tsx"
+    - "SPECS*/**/*.xaml"

.github/workflows/quickstart_2.0.yml

@@ -3,64 +3,55 @@
 #
 # Workflow to automatedly verify the quickstart instructions
 
-name: Verify Quickstart 2.0
+name: Verify Quickstart 3.0
 
 on:
   workflow_dispatch:
   schedule:
     - cron: "0 15 * * *"
 
 jobs:
-  get_input-srpms:
-    runs-on: ubuntu-latest
-
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v4
-      with:
-        ref: '2.0-stable'
-
-    - name: Set up Go 1.20
-      uses: actions/setup-go@v5
-      with:
-        go-version: 1.20
-      id: go
-
-    - name: Install Remaining Prerequisites
-      run: |
-        # Golang and docker are already installed on the agent
-        sudo apt-get update
-        sudo apt -y install make tar wget curl rpm qemu-utils genisoimage python-minimal bison gawk parted
-        sudo apt -y install pigz
-
-    - name: Download SRPMS
-      run: |
-        pushd toolkit
-        sudo make go-tools REBUILD_TOOLS=y
-        sudo make input-srpms DOWNLOAD_SRPMS=y
-        popd
-
   iso_quickstart:
     runs-on: ubuntu-latest
 
     steps:
     - name: Checkout
       uses: actions/checkout@v4
       with:
-        ref: '2.0-stable'
+        ref: '3.0-stable'
 
-    - name: Set up Go 1.20
+    - name: Set up Go 1.21
       uses: actions/setup-go@v5
       with:
-        go-version: 1.20
+        go-version: 1.21
       id: go
 
     - name: Install Remaining Prerequisites
       run: |
         # Golang and docker are already installed on the agent
         sudo apt-get update
-        sudo apt -y install make tar wget curl rpm qemu-utils genisoimage python-minimal bison gawk parted
-        sudo apt -y install pigz
+        sudo apt -y install \
+            acl \
+            curl \
+            gawk \
+            genisoimage \
+            git \
+            golang-1.21-go \
+            jq \
+            make \
+            parted \
+            pigz \
+            openssl \
+            systemd \
+            qemu-utils \
+            rpm \
+            tar \
+            wget \
+            xfsprogs
+
+        # Fix go 1.21 link
+        sudo ln -vsf /usr/lib/go-1.21/bin/go /usr/bin/go
+        sudo ln -vsf /usr/lib/go-1.21/bin/gofmt /usr/bin/gofmt
 
     - name: ISO Quick Start
       run: |
@@ -75,23 +66,41 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v4
       with:
-        ref: '2.0-stable'
+        ref: '3.0-stable'
 
-    - name: Set up Go 1.20
+    - name: Set up Go 1.21
       uses: actions/setup-go@v5
       with:
-        go-version: 1.20
+        go-version: 1.21
       id: go
 
     - name: Install Remaining Prerequisites
       run: |
         # Golang and docker are already installed on the agent
-        sudo apt-get update
-        sudo apt -y install make tar wget curl rpm qemu-utils genisoimage python-minimal bison gawk parted
-        sudo apt -y install pigz
-
+        sudo apt -y install \
+            acl \
+            curl \
+            gawk \
+            genisoimage \
+            git \
+            golang-1.21-go \
+            jq \
+            make \
+            parted \
+            pigz \
+            openssl \
+            systemd \
+            qemu-utils \
+            rpm \
+            tar \
+            wget \
+            xfsprogs
+
+        # Fix go 1.21 link
+        sudo ln -vsf /usr/lib/go-1.21/bin/go /usr/bin/go
+        sudo ln -vsf /usr/lib/go-1.21/bin/gofmt /usr/bin/gofmt
     - name: VHDX Quick Start
       run: |
         pushd toolkit
         sudo make image REBUILD_TOOLS=y REBUILD_PACKAGES=n CONFIG_FILE=./imageconfigs/core-efi.json
-        popd
+        popd

.pipelines/containerSourceData/cdi/Dockerfile-cdi-apiserver

@@ -10,9 +10,6 @@ ARG USER
 
 @INCLUDE_MAIN_RUN_INSTRUCTION@
 
-# workaround till binaries rename is merged
-RUN [ -f /usr/bin/virt-cdi-apiserver ] && mv -f /usr/bin/virt-cdi-apiserver /usr/bin/cdi-apiserver
-
 #simple smoke test
 RUN ls /usr/bin/cdi-apiserver
 

.pipelines/containerSourceData/cdi/Dockerfile-cdi-controller

@@ -10,9 +10,6 @@ ARG USER
 
 @INCLUDE_MAIN_RUN_INSTRUCTION@
 
-# workaround till binaries rename is merged
-RUN [ -f /usr/bin/virt-cdi-controller ] && mv -f /usr/bin/virt-cdi-controller /usr/bin/cdi-controller
-
 #simple smoke test
 RUN ls /usr/bin/cdi-controller
 

.pipelines/containerSourceData/cdi/Dockerfile-cdi-importer

@@ -10,9 +10,6 @@ ARG USER
 
 @INCLUDE_MAIN_RUN_INSTRUCTION@
 
-# workaround till binaries rename is merged
-RUN [ -f /usr/bin/virt-cdi-importer ] && mv -f /usr/bin/virt-cdi-importer /usr/bin/cdi-importer
-
 #simple smoke test
 RUN ls /usr/bin/cdi-importer
 

.pipelines/containerSourceData/cdi/Dockerfile-cdi-operator

@@ -10,9 +10,6 @@ ARG USER
 
 @INCLUDE_MAIN_RUN_INSTRUCTION@
 
-# workaround till binaries rename is merged
-RUN [ -f /usr/bin/virt-cdi-operator ] && mv -f /usr/bin/virt-cdi-operator /usr/bin/cdi-operator
-
 #simple smoke test
 RUN ls /usr/bin/cdi-operator
 

.pipelines/containerSourceData/cdi/Dockerfile-cdi-uploadproxy

@@ -10,9 +10,6 @@ ARG USER
 
 @INCLUDE_MAIN_RUN_INSTRUCTION@
 
-# workaround till binaries rename is merged
-RUN [ -f /usr/bin/virt-cdi-uploadproxy ] && mv -f /usr/bin/virt-cdi-uploadproxy /usr/bin/cdi-uploadproxy
-
 #simple smoke test
 RUN ls /usr/bin/cdi-uploadproxy
 

.pipelines/containerSourceData/cdi/Dockerfile-cdi-uploadserver

@@ -10,9 +10,6 @@ ARG USER
 
 @INCLUDE_MAIN_RUN_INSTRUCTION@
 
-# workaround till binaries rename is merged
-RUN [ -f /usr/bin/virt-cdi-uploadserver ] && mv -f /usr/bin/virt-cdi-uploadserver /usr/bin/cdi-uploadserver
-
 #simple smoke test
 RUN ls /usr/bin/cdi-uploadserver
 

.pipelines/containerSourceData/scripts/BuildNvidiaDriverContainers.sh

@@ -167,7 +167,7 @@ function get_component_name_and_version {
     COMPONENT="$IMAGE"
     echo "Component name                -> $COMPONENT"
 
-    COMPONENT_VERSION=$(rpm -q --qf '%{VERSION}-%{release}\n' -p $HOST_MOUNTED_DIR/RPMS/x86_64/$IMAGE* |  rev | cut -d '.' -f 2- | rev)
+    COMPONENT_VERSION=$(rpm -q --qf '%{VERSION}-%{release}\n' -p $HOST_MOUNTED_DIR/RPMS/x86_64/$IMAGE-[0-9]* |  rev | cut -d '.' -f 2- | rev)
     echo "Component Version             -> $COMPONENT_VERSION"
 }
 

.pipelines/containerSourceData/valkey/Dockerfile-Valkey

@@ -0,0 +1,26 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+ARG BASE_IMAGE
+
+FROM $BASE_IMAGE
+
+@INCLUDE_MAIN_RUN_INSTRUCTION@
+
+RUN set -eux && \
+    valkey-cli --version && \
+    valkey-server --version && \
+    mkdir /data && \
+    chown valkey:valkey /data
+
+VOLUME /data
+WORKDIR /data
+
+COPY valkey-docker-entrypoint.sh /usr/local/bin/
+
+RUN chmod +x /usr/local/bin/valkey-docker-entrypoint.sh
+
+ENTRYPOINT ["/usr/local/bin/valkey-docker-entrypoint.sh"]
+
+EXPOSE 6379
+CMD ["valkey-server"]

.pipelines/containerSourceData/valkey/configuration-files/valkey-docker-entrypoint.sh

@@ -0,0 +1,26 @@
+#!/bin/bash
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+set -e
+
+# first arg is `-f` or `--some-option`
+# or first arg is `something.conf`
+if [ "${1#-}" != "$1" ] || [ "${1%.conf}" != "$1" ]; then
+    set -- valkey-server "$@"
+fi
+
+# allow the container to be started with `--user`
+if [ "$1" = 'valkey-server' -a "$(id -u)" = '0' ]; then
+    find . \! -user valkey -exec chown valkey '{}' +
+    exec setpriv --reuid=valkey --regid=valkey --init-groups --inh-caps=-all "$BASH_SOURCE" "$@"
+fi
+
+# set an appropriate umask (if one isn't set already)
+# - https://github.com/docker-library/redis/issues/305
+# - https://github.com/redis/redis/blob/bb875603fb7ff3f9d19aad906bd45d7db98d9a39/utils/systemd-redis_server.service#L37
+um="$(umask)"
+if [ "$um" = '0022' ]; then
+	umask 0077
+fi
+
+exec "$@" $VALKEY_EXTRA_FLAGS

.pipelines/containerSourceData/valkey/valkey.name

@@ -0,0 +1 @@
+valkey

.pipelines/containerSourceData/valkey/valkey.pkg

@@ -0,0 +1,3 @@
+valkey
+cronie
+util-linux

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

@@ -547,6 +547,7 @@
                 "kata-containers",
                 "kde-filesystem",
                 "kde-settings",
+                "kernel-srpm-macros",
                 "kexec-tools",
                 "keybinder3",
                 "keycloak-httpd-client-install",
@@ -1761,6 +1762,7 @@
                 "python-poetry-core",
                 "python-process-tests",
                 "python-productmd",
+                "python-prometheus_client",
                 "python-ptyprocess",
                 "python-pycares",
                 "python-pycosat",
@@ -1771,7 +1773,6 @@
                 "python-pyproject-metadata",
                 "python-pyroute2",
                 "python-pyrsistent",
-                "python-pysocks",
                 "python-pytest-benchmark",
                 "python-pytest-cov",
                 "python-pytest-expect",
@@ -2451,12 +2452,46 @@
         "NVIDIA": {
             "license": "[ASL 2.0 License and spec specific licenses](http://www.apache.org/licenses/LICENSE-2.0)",
             "specs": [
+                "fwctl",
+                "fwctl-signed",
+                "ibarr",
+                "ibsim",
+                "iser",
+                "iser-signed",
+                "isert",
+                "isert-signed",
+                "knem",
+                "knem-modules-signed",
                 "libnvidia-container",
+                "mft_kernel",
+                "mft_kernel-signed",
+                "mlnx-ethtool",
+                "mlnx-iproute2",
+                "mlnx-nfsrdma",
+                "mlnx-nfsrdma-signed",
+                "mlnx-ofa_kernel",
+                "mlnx-ofa_kernel-modules-signed",
                 "mlnx-tools",
                 "mlx-bootctl",
+                "mlx-steering-dump",
+                "multiperf",
                 "nvidia-container-toolkit",
+                "ofed-docs",
                 "ofed-scripts",
-                "perftest"
+                "perftest",
+                "rshim",
+                "sockperf",
+                "srp",
+                "srp-signed",
+                "xpmem",
+                "xpmem-lib",
+                "xpmem-modules-signed"
+            ]
+        },
+        "NVIDIA (BSD)": {
+            "license": "[BSD](https://github.com/Mellanox/sockperf/blob/sockperf_v2/copying)",
+            "specs": [
+                "sockperf"
             ]
         },
         "OpenEuler": {