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

chore: Remove repo upgrade test #3253

Merged
merged 7 commits into from
May 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 0 additions & 23 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -89,29 +89,6 @@ jobs:
if: ${{ env.IS_NOOP == 'true' }}
run: echo "No checks on main or release branches, skipping this job."

test-repository-upgrade:
name: Test repository upgrade
runs-on: ubuntu-latest
env:
IS_NOOP: ${{ github.ref_name == 'main' || startsWith(github.ref_name, 'release-') }}
steps:
- name: Inform on no-op
run: echo "Running this as a no-op job... ${{ env.IS_NOOP}}"
- name: Run preparatory steps
if: ${{ env.IS_NOOP == 'false' }}
uses: dasch-swiss/dsp-api/.github/actions/preparation@main
with:
java-version: 21
- name: Test repository upgrade
if: ${{ env.IS_NOOP == 'false' }}
run: make test-repository-upgrade
- name: Dump docker logs
if: ${{ env.IS_NOOP == 'false' }}
uses: jwalton/gh-docker-logs@v2
- name: No-op step
if: ${{ env.IS_NOOP == 'true' }}
run: echo "No checks on main or release branches, skipping this job."

test-docs-build:
name: Test docs
runs-on: ubuntu-latest
Expand Down
13 changes: 0 additions & 13 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -171,19 +171,6 @@ stack-db-only: ## starts only fuseki.
## Test Targets
#################################

.PHONY: test-repository-upgrade
test-repository-upgrade: build init-db-test-minimal ## runs DB upgrade integration test
@rm -rf $(CURRENT_DIR)/.tmp/knora-test-data/v7.0.0/
@mkdir -p $(CURRENT_DIR)/.tmp/knora-test-data/v7.0.0/
@unzip $(CURRENT_DIR)/test_data/v7.0.0/v7.0.0-knora-test.trig.zip -d $(CURRENT_DIR)/.tmp/knora-test-data/v7.0.0/
# empty repository
$(CURRENT_DIR)/webapi/scripts/fuseki-empty-repository.sh -r knora-test -u admin -p test -h localhost:3030
# load v7.0.0 data
$(CURRENT_DIR)/webapi/scripts/fuseki-upload-repository.sh -r knora-test -u admin -p test -h localhost:3030 $(CURRENT_DIR)/.tmp/knora-test-data/v7.0.0/v7.0.0-knora-test.trig
# call target which restarts the API and emits error if API does not start
# after a certain time. at startup, data should be upgraded.
@$(MAKE) -f $(THIS_FILE) stack-up

.PHONY: test-all
test-all: test integration-test

Expand Down
20 changes: 4 additions & 16 deletions docs/01-introduction/example-project.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,6 @@ DSP-API comes with two example projects, called `incunabula` and
a reduced version of a real research project on early printed books. It
is designed to store an image of each page of each book, as well as RDF
data about books, pages, their contents, and relationships between them.
At the moment, only the RDF data is provided in the example project, not
the images.

The `incunabula` ontology is in the file `incunabula-onto.ttl`, and its
data is in the file `incunabula-demo-data.ttl`. Both these files are in
a standard RDF file format called
[Turtle](https://www.w3.org/TR/turtle/). The DSP-API distribution includes
sample scripts (in the `webapi/scripts` directory) for importing these
files directly into different triplestores. If you are starting a new
project from scratch, you can adapt these scripts to import your
ontology (and any existing RDF data) into your triplestore for use with
DSP-API.

## The Incunabula Ontology

Expand Down Expand Up @@ -114,7 +102,7 @@ have the same predicate; a comma (`,`) is used to avoid repeating the
predicate. The definition of `:title` says:

* `rdf:type owl:ObjectProperty`: It is an `owl:ObjectProperty`. There are
two kinds of OWL properties: object properties and datatype properties.
two kinds of OWL properties: object properties and datatype properties.
Object properties point to objects, which have IRIs and
can have their own properties. Datatype properties point to literal
values, such as strings and integers.
Expand Down Expand Up @@ -174,10 +162,10 @@ relationship is expressed using the property `incunabula:partOf`:

The key things to notice here are:

* `rdfs:subPropertyOf knora-base:isPartOf`: The `knora-base` ontology provides a generic `isPartOf` property to express
part-whole relationships. A project may use `knora-base:isPartOf` directly, however creating a subproperty such as
* `rdfs:subPropertyOf knora-base:isPartOf`: The `knora-base` ontology provides a generic `isPartOf` property to express
part-whole relationships. A project may use `knora-base:isPartOf` directly, however creating a subproperty such as
`incunabula:partOf` will allow to customize the property further, e.g. by giving it a more descriptive label.
It is important to note that `knora-base:isPartOf` is a subproperty of `knora-base:hasLinkTo`. Any property that
It is important to note that `knora-base:isPartOf` is a subproperty of `knora-base:hasLinkTo`. Any property that
points to a `knora-base:Resource` must be a subproperty of `knora-base:hasLinkTo`. Such a
property is called a *link property*.
* `knora-base:objectClassConstraint :book`: The object of this property must be a member of the class `incunabula:book`,
Expand Down
2 changes: 1 addition & 1 deletion docs/02-dsp-ontologies/knora-base.md
Original file line number Diff line number Diff line change
Expand Up @@ -1193,5 +1193,5 @@ public discussion on proposed entities to be shared. Once a consensus was reache

The Knora base ontology has the property `kb:ontologyVersion`, whose object is a string that indicates the deployed
version of all the DSP-API built-in ontologies. This allows the
[repository update program](../04-publishing-deployment/updates.md) to determine which repository updates are needed
repository update program to determine which repository updates are needed
when DSP-API is upgraded.
21 changes: 0 additions & 21 deletions docs/04-publishing-deployment/updates.md

This file was deleted.

1 change: 0 additions & 1 deletion mkdocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ nav:
- Publishing and Deployment:
- Publishing: 04-publishing-deployment/publishing.md
- Configuration: 04-publishing-deployment/configuration.md
- Updating Repositories when Upgrading DSP-API: 04-publishing-deployment/updates.md
- DSP Internals:
- Design:
- Architectural Decision Records (ADR):
Expand Down
Loading
Loading