Skip to content
This repository has been archived by the owner on Jan 8, 2024. It is now read-only.

Commit

Permalink
Adapt subrepos and github workflow to build and tag platform on v2.2-…
Browse files Browse the repository at this point in the history
…branch

* oisp-services repo update to fix python linting
* Release build using workflow from local branch
* Removed make update from makefile.yml and release.yaml to avoid using develop versions
  • Loading branch information
wagmarcel committed Nov 22, 2022
1 parent 93ce1e8 commit 4d4deb6
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 5 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/makefile.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,7 @@ jobs:
run: |
export TERM=vt100
git submodule update --recursive --init
make update
# make update
- name: Build platform
run: |
set +o pipefail
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:

jobs:
test:
uses: Open-IoT-Service-Platform/platform-launcher/.github/workflows/makefile.yaml@develop
uses: Open-IoT-Service-Platform/platform-launcher/.github/workflows/makefile.yaml@v2.2-branch
with:
UPGRADE_TEST: "false"
secrets:
Expand Down Expand Up @@ -45,7 +45,7 @@ jobs:
export TERM=vt100
set +o pipefail
git submodule update --recursive --init
make update
# make update
yes | DOCKER_TAG=test NODOCKERLOGIN=true DEBUG=true make build
- name: Push images
shell: bash
Expand Down
2 changes: 1 addition & 1 deletion oisp-services
Submodule oisp-services updated 40 files
+9 −20 Dockerfile
+0 −117 component-splitter/checkstyle/checkstyle.xml
+0 −586 component-splitter/pom-next.xml
+0 −586 component-splitter/pom.xml
+0 −416 component-splitter/pom.xml.bak
+0 −144 component-splitter/src/main/java/org/oisp/services/ComponentSplitter.java
+0 −9 metrics-aggregator/README.md
+0 −117 metrics-aggregator/checkstyle/checkstyle.xml
+0 −58 metrics-aggregator/checkstyle/pmdRuleSet.xml
+0 −537 metrics-aggregator/pom.xml
+0 −69 metrics-aggregator/src/main/java/org/oisp/services/MetricsAggregator.java
+0 −76 metrics-aggregator/src/main/java/org/oisp/services/collections/AggregatedObservation.java
+0 −164 metrics-aggregator/src/main/java/org/oisp/services/collections/Observation.java
+0 −38 metrics-aggregator/src/main/java/org/oisp/services/collections/ObservationList.java
+0 −38 metrics-aggregator/src/main/java/org/oisp/services/conf/CmdlineOptions.java
+0 −26 metrics-aggregator/src/main/java/org/oisp/services/conf/Config.java
+0 −39 metrics-aggregator/src/main/java/org/oisp/services/dataStructures/AggregatedValues.java
+0 −97 metrics-aggregator/src/main/java/org/oisp/services/dataStructures/Aggregator.java
+0 −225 metrics-aggregator/src/main/java/org/oisp/services/pipelines/FullPipelineBuilder.java
+0 −138 metrics-aggregator/src/main/java/org/oisp/services/transforms/AggregateAll.java
+0 −49 metrics-aggregator/src/main/java/org/oisp/services/transforms/KafkaObservationSink.java
+0 −97 metrics-aggregator/src/main/java/org/oisp/services/transforms/KafkaObservationSource.java
+0 −29 metrics-aggregator/src/main/java/org/oisp/services/transforms/KafkaObservationsSinkProcessor.java
+0 −29 metrics-aggregator/src/main/java/org/oisp/services/transforms/KafkaObservationsSourceProcessor.java
+0 −53 metrics-aggregator/src/main/java/org/oisp/services/transforms/KafkaToFilteredObservationFn.java
+0 −51 metrics-aggregator/src/main/java/org/oisp/services/transforms/SendObservation.java
+0 −30 metrics-aggregator/src/main/java/org/oisp/services/utils/LogHelper.java
+0 −57 metrics-aggregator/src/main/java/org/oisp/services/utils/ObservationDeserializer.java
+0 −41 metrics-aggregator/src/main/java/org/oisp/services/utils/ObservationSerializer.java
+0 −62 metrics-aggregator/src/main/java/org/oisp/services/windows/FullTimeInterval.java
+0 −26 metrics-aggregator/src/main/resources/log4j.xml
+0 −28 metrics-aggregator/src/test/java/org/oisp/services/dataStructures/AggregatorTest.java
+0 −238 metrics-aggregator/src/test/java/org/oisp/services/transforms/AggregateAllTest.java
+0 −70 metrics-aggregator/src/test/java/org/oisp/services/transforms/SendObservationTest.java
+0 −41 metrics-aggregator/src/test/java/org/oisp/services/utils/ObservationDeserializerTest.java
+0 −52 metrics-aggregator/src/test/java/org/oisp/services/utils/ObservationSerializerTest.java
+15 −6 services-operator/beamservicesoperator.py
+3 −1 services-operator/beamsqlstatementsetoperator.py
+9 −4 services-operator/flink_util.py
+1 −1 simple-flink-sql-gateway/udf/GetJsonField/pom.xml

0 comments on commit 4d4deb6

Please sign in to comment.