Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Store sbom dependencies as jenkins artifacts #3462

Merged
merged 1 commit into from
Sep 1, 2023

Conversation

adamfarley
Copy link
Contributor

We've had a number of sbom-creation failures related to corrupted downloads from maven, so this stores the jars we need on Jenkins to avoid the maven issue.

Also includes the build.xml changes needed to fetch the jars from their new location.

We've had a number of sbom-creation failures related to
corrupted downloads from maven, so this stores the jars we need
on Jenkins to avoid the maven issue.

Also includes the build.xml changes needed to fetch the jars from
their new location.

Signed-off-by: Adam Farley <[email protected]>
@zdtsw
Copy link
Contributor

zdtsw commented Aug 23, 2023

how is this new job going to be created in jenkins? https://github.com/adoptium/temurin-build/pull/3462/files#diff-da8c4d473444fbe9429f2fd06e2ff65a5a788ed9f7272842b1cabc7301d24e0d is just a jenkinsfile

shouldn't it be put in jenkins repo

@adamfarley
Copy link
Contributor Author

how is this new job going to be created in jenkins? https://github.com/adoptium/temurin-build/pull/3462/files#diff-da8c4d473444fbe9429f2fd06e2ff65a5a788ed9f7272842b1cabc7301d24e0d is just a jenkinsfile

shouldn't it be put in jenkins repo

I tried to follow the test.getDependency example, where the job was created manually and the jenkins file stored in aqa-tests repo.

The build.getDependency job has already been created and tested, see here for details. Note that all recent job/s will fail because I already updated it to fetch the jenkins file from the location it will be stored at once this PR is merged.

Copy link
Contributor

@andrew-m-leonard andrew-m-leonard left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@adamfarley adamfarley removed the request for review from zdtsw August 30, 2023 11:38
Copy link
Contributor

@steelhead31 steelhead31 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@steelhead31 steelhead31 merged commit 8b75b17 into adoptium:master Sep 1, 2023
27 checks passed
@sophia-guo
Copy link
Contributor

#3462 (comment)

I would also prefer the jenkinsfile should be put in ci-jenkins-pipeline repo

@sophia-guo
Copy link
Contributor

Probably also prefer those jar put in job https://ci.adoptium.net/view/Dependencies/job/dependency_pipeline/ instead of separate build.dependency job

@adamfarley
Copy link
Contributor Author

If we do put the jenkinsfile into ci-jenkins-pipeline and also merge it into the dependency_pipeline job (as @sophia-guo suggests) then we should also do the same with test.getDependency for consistency.

I don't have as preference either way, so long as the dependencies are available through jenkins (to prevent the maven download issues this PR was designed to prevent).

@smlambert - What do you think?

@smlambert
Copy link
Contributor

Organizationally,

  • test pipeline scripts are in aqa-tests
    • test.getDependency groovy script lives in the aqa-tests repo along with all test pipeline code, and it is fine to stay there
  • build pipeline scripts are in ci-jenkins-pipeline
  • scripts that support standalone build of Temurin are in temurin-build

@adamfarley
Copy link
Contributor Author

* scripts that support standalone build of Temurin are in temurin-build

Thanks for the information Shelley. :)

Since these dependencies are needed for a Temurin standalone build, my interpretation is that the file that knows where to fetch the dependencies from (in a way that doesn't depend on the Adoptium servers) should be stored in temurin-build.

@smlambert
Copy link
Contributor

Sorry, by what I shared, I meant to say I agree about putting CI scripts (Jenkinsfile / groovy scripts meant to be run in a CI server, not in a standalone build) into ci-jenkins-pipeline repository.

@adamfarley adamfarley deleted the get_dependencies_for_sbom branch July 10, 2024 14:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants