Skip to content

Commit 8f57105

Browse files
move src tarballs to AME - mariner 2.0 (#8925)
Co-authored-by: CBL-Mariner Servicing Account <cblmargh@microsoft.com>
1 parent 8c0c3ed commit 8f57105

14 files changed

Lines changed: 99 additions & 96 deletions

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ When creating your PR, please ensure the following:
155155

156156
* Package tests (%check section) have been verified with RUN_CHECK=y for existing SPEC files, or added to new SPEC files. When running the check section, results will not fail a build. Check the logs for the results of this section.
157157

158-
* All package sources are available. The sources are either in the source server or local `SPECS` folder (`SPECS/<package>/SOURCES` or `SPECS/<package>`). While it is possible to build packages with all sources inside the repo, our policy is generally to have the source compressed and placed on the source server. Uploading to the source server can only be accomplished by a CBL-Mariner developer. Please request help in your PR for uploading your sources to the source server. To check the source server see [https://cblmarinerstorage.blob.core.windows.net/sources/core/< source tar >].
158+
* All package sources are available. The sources are either in the source server or local `SPECS` folder (`SPECS/<package>/SOURCES` or `SPECS/<package>`). While it is possible to build packages with all sources inside the repo, our policy is generally to have the source compressed and placed on the source server. Uploading to the source server can only be accomplished by a CBL-Mariner developer. Please request help in your PR for uploading your sources to the source server. To check the source server see [https://azurelinuxsrcstorage.blob.core.windows.net/sources/core/< source tar >].
159159

160160
* cgmanifest files are up-to-date and alphabetically sorted. The cgmanifest files are used to record all package sources. They include the following files:
161161

SPECS/mariner-rpm-macros/macros

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,4 +258,4 @@ end
258258

259259
# CBL-Mariner's sources storage URL.
260260
# NOTE: only allowed to be used for source URLs when original, upstream source cannot be found.
261-
%_mariner_sources_url https://cblmarinerstorage.blob.core.windows.net/sources/core
261+
%_mariner_sources_url https://azurelinuxsrcstorage.blob.core.windows.net/sources/core

SPECS/mariner-rpm-macros/mariner-rpm-macros.signatures.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"gen-ld-script.sh": "894b394f376dae7be23c314b79f31772aa40a24895122242abd7a178aea9cade",
1111
"generate-package-note.py": "bd76a8e88a1356fed74863c38e5cf6a20c1c26426ac94ba21dd172578e8ca2a2",
1212
"gpgverify": "db0e050f56b694497d70603a6f5c17dd60ddbcf7cee670616851cd389f6767c4",
13-
"macros": "b7ad5c17d6ce105427eeef54f43317cb1cc8cc114bfeca7693069242ad747d20",
13+
"macros": "bf80326fbf519379f4ec7e4f09d8582161ca1b6599d5424cf7018659120ba925",
1414
"macros.check": "79367176c3c7d10c0158b6e5d881e0fc3c8fd50c5957dad2f097c2d4a37833e7",
1515
"macros.dist": "817653f151349adff8c658143cf01ad1f8b51168be2087e4e02778224da85d63",
1616
"macros.fonts": "f52edc646414c5dd0f5f4cdd570f2f9dbe6fb97d4f0db360908deb56d96492f8",

SPECS/mariner-rpm-macros/mariner-rpm-macros.spec

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
Summary: Mariner specific rpm macro files
77
Name: mariner-rpm-macros
88
Version: 2.0
9-
Release: 24%{?dist}
9+
Release: 25%{?dist}
1010
License: GPL+ AND MIT
1111
Vendor: Microsoft Corporation
1212
Distribution: Mariner
@@ -125,6 +125,9 @@ install -p -m 644 -t %{buildroot}%{rcluadir}/srpm forge.lua
125125
%{_rpmconfigdir}/macros.d/macros.check
126126

127127
%changelog
128+
* Fri Apr 26 2024 Nicolas Guibourge <nicolasg@microsoft.com> - 2.0-25
129+
- Move src tarball location to AME
130+
128131
* Thu Nov 09 2023 George Mileka <gmileka@microsoft.com> - 2.0-24
129132
- Update ccache to use the compiler content for comparison.
130133

SPECS/maven/maven_build_caches.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ fi
5353
SOURCEURL="https://archive.apache.org/dist/maven/maven-3/${VERSION}/source/apache-maven-${VERSION}-src.tar.gz"
5454
# Maven binary dependency to download from blocb store.
5555
# NOTE: Version IN THIS IS HARDCODED.
56-
MAVENBINARY="https://cblmarinerstorage.blob.core.windows.net/sources/core/maven-3.5.4-13.cm1.${BUILDARCH}.rpm"
56+
MAVENBINARY="https://azurelinuxsrcstorage.blob.core.windows.net/sources/core/maven-3.5.4-13.cm1.${BUILDARCH}.rpm"
5757

5858
maven_m2_cache_tarball_name="apache-maven-${VERSION}-m2.tar.gz"
5959
maven_licenses_tarball_name="apache-maven-${VERSION}-licenses.tar.gz"

0 commit comments

Comments
 (0)