Merge branch '3.0-dev' into mbykhovtsev/3.0-sync

Author: mbykhovtsev-ms

.pipelines/containerSourceData/scripts/PublishContainers.sh

@@ -92,11 +92,52 @@ function acr_login {
 # $1: image name
 function oras_attach {
     local image_name=$1
+    local max_retries=3
+    local retry_count=0
+
+    while [ $retry_count -lt $max_retries ]; do
+        echo "+++ Attempting to attach lifecycle annotation to $image_name (attempt $((retry_count + 1))/$max_retries)"
+        
+        if oras attach \
+            --artifact-type "application/vnd.microsoft.artifact.lifecycle" \
+            --annotation "vnd.microsoft.artifact.lifecycle.end-of-life.date=$END_OF_LIFE_1_YEAR" \
+            "$image_name"; then
+            echo "+++ Successfully attached lifecycle annotation to $image_name"
+            return 0
+        else
+            retry_count=$((retry_count + 1))
+            if [ $retry_count -lt $max_retries ]; then
+                echo "+++ Failed to attach lifecycle annotation to $image_name. Retrying in 5 seconds..."
+                sleep 5
+            else
+                echo "+++ Failed to attach lifecycle annotation to $image_name after $max_retries attempts"
+                return 1
+            fi
+        fi
+    done
+}
+
+# Detach the end-of-life annotation from the container image.
+# $1: image name
+function oras_detach {
+    local image_name=$1
+    lifecycle_manifests=$(oras discover -o json  --artifact-type "application/vnd.microsoft.artifact.lifecycle" "$image_name")
+    manifests=$(echo "$lifecycle_manifests" | jq -r '.manifests')
+
+    if [[ -z $manifests ]]; then
+        echo "+++ No lifecycle manifests found for $image_name"
+        return
+    fi
 
-    oras attach \
-        --artifact-type "application/vnd.microsoft.artifact.lifecycle" \
-        --annotation "vnd.microsoft.artifact.lifecycle.end-of-life.date=$END_OF_LIFE_1_YEAR" \
-        "$image_name"
+    echo "+++ Found lifecycle manifests for $image_name: $manifests"
+    # Loop through the manifests and delete them.
+    manifest_count=$(echo "$manifests" | jq length)
+    for (( i=0; i<manifest_count; i++ )); do
+        digest=$(echo "$lifecycle_manifests" | jq -r ".manifests[$i].digest")
+        echo "Deleting manifest with digest: $digest"
+        imageNameWithoutTag=${image_name%:*}
+        oras manifest delete --force "$imageNameWithoutTag@$digest"
+    done
 }
 
 function create_multi_arch_tags {
@@ -191,6 +232,7 @@ function create_multi_arch_tags {
     echo "+++ push $full_multiarch_tag tag"
     docker manifest push "$full_multiarch_tag"
     echo "+++ $full_multiarch_tag tag pushed successfully"
+    oras_detach "$full_multiarch_tag"
     oras_attach "$full_multiarch_tag"
 
     # Save the multi-arch tag to a file.
@@ -281,6 +323,7 @@ do
             docker image tag "$amd64_image" "$amd64_retagged_image_name"
             docker rmi "$amd64_image"
             docker image push "$amd64_retagged_image_name"
+            oras_detach "$amd64_retagged_image_name"
             oras_attach "$amd64_retagged_image_name"
 
             if [[ $ARCHITECTURE_TO_BUILD == *"ARM64"*  ]]; then
@@ -289,6 +332,7 @@ do
                 docker image tag "$arm64_image" "$arm64_retagged_image_name"
                 docker rmi "$arm64_image"
                 docker image push "$arm64_retagged_image_name"
+                oras_detach "$arm64_retagged_image_name"
                 oras_attach "$arm64_retagged_image_name"
             fi
 

.pipelines/templates/PackageTestResultsAnalysis.yml

@@ -32,7 +32,8 @@ parameters:
     default: "$(Agent.TempDirectory)"
 
 steps:
-  - bash: pip3 install --user junit_xml==1.9
+    # TODO: the "--index-url" argument must be removed once accessing internal ADO feeds from fork PR checks is supported.
+  - bash: pip3 install --user junit_xml==1.9 --index-url https://pypi.org/simple
     retryCountOnTaskFailure: 3
     displayName: "Install Python dependencies"
 

.pipelines/templates/ToolchainBuild.yml

@@ -41,7 +41,7 @@ steps:
       buildRepoRoot: ${{ parameters.buildRepoRoot }}
 
   - bash: |
-      if [[ -n ${{ parameters.dailyBuildID }} ]]; then
+      if [[ -n "${{ parameters.dailyBuildID }}" ]]; then
         daily_build_id_arg="DAILY_BUILD_ID=${{ parameters.dailyBuildID }}"
       fi
 

SPECS-EXTENDED/PyGreSQL/PyGreSQL.signatures.json

@@ -1,5 +1,5 @@
 {
  "Signatures": {
-  "PyGreSQL-5.2.2.tar.gz": "8c6c56f95cf08337075be0930a1d28333624ebcd6180cf888c59d3e2887f32ce"
+  "PyGreSQL-6.0.1.tar.gz": "57e44af29c7443641ca65e549e568848946f937597cf19064bbfadc4e5e53bfb"
  }
 }

SPECS-EXTENDED/PyGreSQL/PyGreSQL.spec

@@ -1,16 +1,18 @@
+%global with_tests 0
+
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
 %global srcname	PyGreSQL
 
 Name:		%{srcname}
-Version:	5.2.2
-Release:	3%{?dist}
+Version:	6.0.1
+Release:	1%{?dist}
 Summary:	Python client library for PostgreSQL
 
 URL:		http://www.pygresql.org/
 License:	PostgreSQL
 
-Source0:	https://github.com/PyGreSQL/%{name}/archive/%{version}/%{name}-%{version}.tar.gz
+Source0:	https://github.com/PyGreSQL/%{name}/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz
 
 BuildRequires:  gcc
 BuildRequires:	libpq-devel
@@ -58,12 +60,18 @@ find -type f -exec chmod 644 {} +
 %files -n python3-pygresql
 %license docs/copyright.rst
 %doc docs/*.rst
-%{python3_sitearch}/*.so
-%{python3_sitearch}/*.py
-%{python3_sitearch}/__pycache__/*.py{c,o}
+%{python3_sitearch}/pg/*.so
+%{python3_sitearch}/pg/*.py
+%{python3_sitearch}//pg/__pycache__/*.py{c,o}
+%{python3_sitearch}/pg/_pg.pyi
+%{python3_sitearch}/pg/py.typed
+%{python3_sitearch}/pgdb/*.py
+%{python3_sitearch}/pgdb/__pycache__/*.py{c,o}
+%{python3_sitearch}/pgdb/py.typed
 %{python3_sitearch}/*.egg-info
 
-
+# Requires postgresql-test-rpm-macros which is not provided by postgresql in Azure Linux.
+%if 0%{?with_tests}
 %check
 %postgresql_tests_run
 
@@ -76,9 +84,12 @@ dbport = $PGPORT
 EOF
 
 %{__python3} setup.py test
-
+%endif
 
 %changelog
+* Wed Sep 25 2024 jyoti kanase <[email protected]> - 6.0.1-1
+- Update to 6.0.1
+
 * Thu Aug 31 2023 Pawel Winogrodzki <[email protected]> - 5.2.2-3
 - Disabling missing test dependency.
 - License verified.

SPECS-EXTENDED/cim-schema/cim-schema.spec

@@ -38,13 +38,13 @@ Distribution:   Azure Linux
 %global update 1
 
 Name:           cim-schema
-Url:            http://www.dmtf.org/
+Url:            https://www.dmtf.org/
 Summary:        Common Information Model (CIM) Schema
 Version:        %{major}.%{minor}.%{update}
-Release:        6%{?dist}
+Release:        7%{?dist}
 License:        LicenseRef-DMTF
-Source0:        http://www.dmtf.org/standards/cim/cim_schema_v%{major}%{minor}%{update}/cim_schema_%{version}Experimental-MOFs.zip
-Source1:        http://www.dmtf.org/standards/cim/cim_schema_v%{major}%{minor}%{update}/cim_schema_%{version}Experimental-Doc.zip
+Source0:        https://www.dmtf.org/standards/cim/cim_schema_v%{major}%{minor}%{update}/cim_schema_%{version}Experimental-MOFs.zip
+Source1:        https://www.dmtf.org/standards/cim/cim_schema_v%{major}%{minor}%{update}/cim_schema_%{version}Experimental-Doc.zip
 Source2:        LICENSE
 BuildArch:      noarch
 
@@ -63,7 +63,7 @@ provides the actual model descriptions.
 
 Authors:
 --------
-    DTMF <http://www.dmtf.org/about/contact>
+    DTMF <https://www.dmtf.org/about/contact>
 
 %description docs
 Common Information Model (CIM) schema documentation.
@@ -88,19 +88,22 @@ ln -s cimv%{version} $RPM_BUILD_ROOT/$MOFDIR/cim-current
 ln -s cim_schema_%{version}.mof $RPM_BUILD_ROOT/$MOFDIR/cim-current/CIM_Schema.mof
 install -d $RPM_BUILD_ROOT/usr/bin
 mkdir -p $RPM_BUILD_ROOT/%{_docdir}/%{name}
-cp -a %{SOURCE2} $RPM_BUILD_ROOT/%{_docdir}/%{name}
+cp -a %{SOURCE2} .
 
 %files
 %dir %{_datarootdir}/mof
 %dir %{_datarootdir}/mof/cimv%{version}
 %{_datarootdir}/mof/cimv%{version}/*
 %{_datarootdir}/mof/cim-current
-%doc %{_docdir}/%{name}/LICENSE
+%license LICENSE
 
 %files docs
 %doc ../%{name}-docs/*
 
 %changelog
+* Thu Jun 19 2025 Kshitiz Godara <[email protected]> - 2.54.1-7
+- Address issues introduced by PR 11486
+
 * Tue Dec 17 2024 Akarsh Chaudhary <[email protected]> - 2.54.1-6
 - Initial Azure Linux import from Fedora 41 (license: MIT).
 - License verified

SPECS-EXTENDED/cim-schema/cim_schema_2.54.1Experimental-Doc.zip

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE1oEe063uuEQa9aqPRSi2zZ5h7yYFAmaf2n8ACgkQRSi2zZ5h
+7ya1EA//X+R/lKh8Pq7hvC90foSIsyH2mFptwtR+piKfH3aMwsszhMDpqgEb1KFa
+rLf44UQv4ZJWSKBx3K7g5TTIm3mYRUaU7yZIcl3/F5XS6/LHaFzIlPqWIqhd4eAS
+h8eP64echKJfkSVZka0T+WAOV9vsWSeGBLmWBSQN1G6iLpW2iz+ntmv6qb5LCE5+
+v/L5lr0/nG4lumAW3rPagysMm2kiJxRZSz7K6hjxa2B61mLo1e8iQfdDohO0h7ok
+4y2qsowKnYlrnKlLGSlDKG3AJ4jkU4HJQ5hUYJ6odUxOOxSdDUfe60CcdeKg0rvw
+p5LoROJ8UIRqSvZuw2s/xoZKjTNhZsW5mRVl2w4gbA07VibNYj5iM3BLeKcdaITX
+nQmeVaS3EZeeAflStkh9uFmTOhuvtwl/ZZa3ksAjYlHjwhjyK2QBpw4wGjuwJdL8
+QMWqjMduBMB1+3IiIGyaoBaMaW2BoP/ESec4p6W8spxNh8KnaOycwtvRLHK2aMfx
+JRsEw1MdjxtRDA3HJDqxXfTAHVQHrb82e0BUMvztfFPpZouPXTGGmFDMwccqMOj4
+FK6rEufrnJqDoAbT8msRH3L78ls+Xw2npBFf9UK+mRLFAtq9iMDAB/Ku8bOURoNb
+CsKF+nSG4AAAusZP4H5qvnMB/XrSuzYH+9Z2KLiAjUMwspSniVc=
+=yn9V
+-----END PGP SIGNATURE-----

SPECS-EXTENDED/cim-schema/cim_schema_2.54.1Experimental-MOFs.zip

@@ -1,5 +1,7 @@
 {
  "Signatures": {
-  "facter-4.2.13.gem": "a4f293b585176b080c8f10e9adb7a4d1cfd484268dfef518b162a0422450264c"
+  "facter-4.8.0.gem": "0950375502fc2ec8a0e55d89d4610be639f6ce5418ab6c5df2205e90e6af6084",
+  "facter-4.8.0.gem.asc": "53cb68dcba913b796bfb85ab07ee2598fab4d344e335a068e9d66e22f8f219a5",
+  "puppet-gpg-signing-key-20250406.pub": "4d5a9c73f97235eebe8c69f728aa2efcc8e1ee02282f972efdbbbd3a430be454"
  }
 }