Skip to content

Commit cdca9d2

Browse files
committed
Cleanup
1 parent 3131db0 commit cdca9d2

File tree

2 files changed

+4
-65
lines changed

2 files changed

+4
-65
lines changed

CONTRIBUTING.md

Lines changed: 0 additions & 16 deletions
This file was deleted.

README.md

Lines changed: 4 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,13 @@
1-
# SapMachine Build Infrastructure
1+
# SapMachine Infrastructure
22

33
[![REUSE status](https://api.reuse.software/badge/github.com/SAP/SapMachine-infrastructure)](https://api.reuse.software/info/github.com/SAP/SapMachine-infrastructure)
44

55
## Description
66

7-
This repository contains tools, scripts and infrastructure required to build, test and maintain the [SapMachine project](https://github.com/SAP/SapMachine).
7+
This repository contains auxiliary data for the [SapMachine project](https://github.com/SAP/SapMachine).
88

9-
The jobs run on our [Jenkins](https://ci.sapmachine.io/) installation.
10-
11-
Mercurial repos are imported to branches **jdk/jdk** and **jdk/jdk10**.
12-
Every few hours, we poll the upstream mercurial repositories and add new changes and tags ([*update-pipeline* on jenkins]( https://ci.sapmachine.io/view/repository-update/job/update-pipeline/)).
13-
14-
The [SapMachine Github Repository](https://github.com/SAP/SapMachine) is organized into the following branches:
15-
16-
* **jdk/jdk** and **jdk/jdk10** are mirrors of the corresponding mercurial repos.
17-
* **sapmachine10**: **jdk/jdk10** + our changes.
18-
* **sapmachine**: **jdk/jdk** + our changes.
19-
* **sapmachine10-alpine**: **sapmachine10** + alpine changes.
20-
* **sapmachine-alpine**: **sapmachine** + alpine changes.
21-
22-
We cherry-pick our changes between sapmachine and sapmachine10.
23-
We merge **jdk/jdk10** and **jdk/jdk** with new build tags.
24-
The job *check-tag-pipeline*, polls these branches for new tags, opens pull requests and starts validation jobs.
25-
Merge is triggered manually, after reviewing test and build results and resolving conflicts if needed.
26-
27-
Build-jobs run in docker containers to have a reproducible build environment.
28-
Different build-jobs use the same Pipeline with different parameters.
29-
Build jobs start test jobs. However, we don't use the result of the tests as indicator of a failure of the build job, as some failures have to be considered a *normal*. Some tests are shaky, other failure address open issues that will be fixed with the next build. However, we should compare our results to the results reported here: http://download.java.net/openjdk/testresults/10/testresults.html
30-
31-
## Requirements
32-
33-
### Jenkins Installation
34-
35-
We run the jobs on a jenkins installation with one server and two clients.
36-
As most of the jobs run in docker containers, docker must be installed on the client machines.
37-
38-
### Access to SapMachine Repository
39-
40-
Some of the jobs need push access to the [SapMachine repository](https://github.com/SAP/SapMachine). It is possible to work with a fork of this repository. The credentials have to be configured in Jenkins.
41-
42-
## Download and Installation
43-
44-
After installing jenkins, one pipeline job has to be configured that runs the Pipeline [jenkins-restore-pipeline](jenkins-restore-pipeline/Jenkinsfile). This jobs imports the whole jenkins configuration. After running this job, the configuration has to be reloaded.
45-
To get all the jobs to function, missing credentials have to be added. Depending on the jenkins installation, some missing plugins have to be installed.
46-
If working with a forked SapMachine repository, the repository URL in most of the Jenkinsfiles has to be changed accordingly.
47-
48-
## Known Issues
49-
50-
There are no known issues.
51-
52-
## How to obtain support
53-
54-
This project is provided as is.
9+
Currently these are merely the docker files.
5510

5611
## License
5712

58-
Copyright 2017-2021 SAP SE or an SAP affiliate company and SapMachine-infrastructure contributors. Please see our [LICENSE](LICENSE) for copyright and license information. Detailed information including third-party components and their licensing/copyright information is available [via the REUSE tool](https://api.reuse.software/info/github.com/SAP/SapMachine-infrastructure).
13+
Copyright 2017-2024 SAP SE or an SAP affiliate company and SapMachine-infrastructure contributors. Please see our [LICENSE](LICENSE) for copyright and license information. Detailed information including third-party components and their licensing/copyright information is available [via the REUSE tool](https://api.reuse.software/info/github.com/SAP/SapMachine-infrastructure).

0 commit comments

Comments
 (0)