diff --git a/helpers/create-abi-dump.py b/helpers/create-abi-dump.py --- a/helpers/create-abi-dump.py +++ b/helpers/create-abi-dump.py @@ -255,6 +255,7 @@ parser.add_argument('--branchGroup', type=str, required=True) parser.add_argument('--buildLog', type=str, required=True) parser.add_argument('--environment', type=str, required=True) +parser.add_argument('--platform', type=str, required=True) parser.add_argument('--usingInstall', type=str, required=True) arguments = parser.parse_args() @@ -303,6 +304,7 @@ "targets": list(library.targets), "project": arguments.project, "branchGroup": arguments.branchGroup, + "platform": arguments.platform, } - packageName = "{name}_{scmRevision}".format(name=library.name, scmRevision=scmRevision) + packageName = "{name}_{scmRevision}_{platform}".format(name=library.name, scmRevision=scmRevision) ourArchive.storePackage(packageName, fileName, scmRevision, extraMetadata) diff --git a/pipeline-templates/SUSEQt5.7.template b/pipeline-templates/SUSEQt5.7.template --- a/pipeline-templates/SUSEQt5.7.template +++ b/pipeline-templates/SUSEQt5.7.template @@ -120,7 +120,7 @@ // Gather ABI Reference information for later checking sh """ curl '$BUILD_URL/consoleText' -o currentBuildLog.txt - python3 -u ci-tooling/helpers/create-abi-dump.py --project ${projectName} --branchGroup ${branchGroup} --buildLog currentBuildLog.txt --environment production --usingInstall '$HOME/install-prefix/' || true + python3 -u ci-tooling/helpers/create-abi-dump.py --project ${projectName} --branchGroup ${branchGroup} --platform ${currentPlatform} --buildLog currentBuildLog.txt --environment production --usingInstall '$HOME/install-prefix/' || true """ // Platform Enablement Checks diff --git a/pipeline-templates/SUSEQt5.9.template b/pipeline-templates/SUSEQt5.9.template --- a/pipeline-templates/SUSEQt5.9.template +++ b/pipeline-templates/SUSEQt5.9.template @@ -120,7 +120,7 @@ // Gather ABI Reference information for later checking sh """ curl '$BUILD_URL/consoleText' -o currentBuildLog.txt - python3 -u ci-tooling/helpers/create-abi-dump.py --project ${projectName} --branchGroup ${branchGroup} --buildLog currentBuildLog.txt --environment production --usingInstall '$HOME/install-prefix/' || true + python3 -u ci-tooling/helpers/create-abi-dump.py --project ${projectName} --branchGroup ${branchGroup} --platform ${currentPlatform} --buildLog currentBuildLog.txt --environment production --usingInstall '$HOME/install-prefix/' || true """ // cppcheck is not supported by Pipeline at the moment, so we don't run that for now