From f329178d731d6a2a59c3a51077e497d73b853124 Mon Sep 17 00:00:00 2001 From: Ravi Pendurty Date: Wed, 16 Jul 2025 17:20:25 +0530 Subject: [PATCH] Use a different github action instead of maven-action Issue-ID: OAM-477 Change-Id: I22688a2df2a883809961271cc73d4d5a0e45d62b Signed-off-by: Ravi Pendurty --- .github/workflows/gerrit-verify.yaml | 14 ++---- Makefile | 98 +++++++++--------------------------- README.md | 1 + pom.xml | 2 +- 4 files changed, 29 insertions(+), 86 deletions(-) diff --git a/.github/workflows/gerrit-verify.yaml b/.github/workflows/gerrit-verify.yaml index f25f9c3..6a0633e 100644 --- a/.github/workflows/gerrit-verify.yaml +++ b/.github/workflows/gerrit-verify.yaml @@ -47,7 +47,7 @@ on: concurrency: # yamllint disable-line rule:line-length - group: compose-maven-verify-${{ github.workflow }}-${{ github.event.inputs.GERRIT_CHANGE_ID || github.run_id }} + group: compose-make-verify-${{ github.workflow }}-${{ github.event.inputs.GERRIT_CHANGE_ID || github.run_id }} cancel-in-progress: true jobs: @@ -84,7 +84,7 @@ jobs: needs: [prepare, sanitize] # use compose-jjb-verify from the v0.4 series of releng-reusable-workflows # yamllint disable-line rule:line-length - uses: ravipendurty/releng-reusable-workflows/.github/workflows/compose-maven-verify.yaml@main + uses: ravipendurty/releng-reusable-workflows/.github/workflows/compose-make-verify.yaml@main with: GERRIT_BRANCH: ${{ inputs.GERRIT_BRANCH }} GERRIT_CHANGE_ID: ${{ inputs.GERRIT_CHANGE_ID }} @@ -97,14 +97,6 @@ jobs: GERRIT_REFSPEC: ${{ inputs.GERRIT_REFSPEC }} JDK_VERSION: "21" MVN_VERSION: "3.9.6" - MVN_PROFILES: "docker" - MVN_PHASES: "clean install" - MVN_PARAMS: "-s settings.xml" - # yamllint disable rule:line-length - MVN_OPTS: >- - -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn - -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r - -DaltDeploymentRepository=staging::default::file:"${GITHUB_WORKSPACE}"/m2repo # yamllint enable rule:line-length ENV_VARS: ${{ toJSON(vars) }} @@ -128,4 +120,4 @@ jobs: gerrit-change-number: ${{ inputs.GERRIT_CHANGE_NUMBER }} gerrit-patchset-number: ${{ inputs.GERRIT_PATCHSET_NUMBER }} vote-type: ${{ env.WORKFLOW_CONCLUSION }} - comment-only: true \ No newline at end of file + comment-only: true diff --git a/Makefile b/Makefile index 58d42da..69c546a 100644 --- a/Makefile +++ b/Makefile @@ -12,78 +12,28 @@ # See the License for the specific language governing permissions and # limitations under the License. -# ------------------------------------------------------------------------- -# Variables -# ------------------------------------------------------------------------- -ACTIVATE = . .venv/bin/activate - -# ------------------------------------------------------------------------- -# Phony targets -# ------------------------------------------------------------------------- -.PHONY: system-check docs hello help - -# ------------------------------------------------------------------------- -# [Install & Setup] -# ------------------------------------------------------------------------- - -install: install-pip system-check ## [Install] Install necessary tools - -venv: ## [Install] Set up Python virtual environment - @echo "## Creating Python virtual environment..." - python3 -m venv .venv - -install-pip: ## [Install] Install Python dependencies - @echo "## Installing Python dependencies..." - $(ACTIVATE) && pip install -r docs/requirements-docs.txt - -docs: ## [Docs] Shows the docker status - @echo "Gererate READ_THE_DOCS output" - tox -e docs,docs-linkcheck - - -# ------------------------------------------------------------------------- -# [System] -# ------------------------------------------------------------------------- - -docker-status: ## [System] Shows the docker status - @docker ps -a --format "table {{.Names}}\t{{.Image}}\t{{.Status}}" - -system-check: hello ## [System] System overview - @echo "## System Overview:" - @df -hT - @free -h - @grep -c ^processor /proc/cpuinfo - @cat /etc/os-release | grep -i pretty - @docker version - @docker compose version - @git --version - @python3 --version - @go version - @timedatectl - @echo "Host: ${HOSTNAME}" - -# ------------------------------------------------------------------------- -# [Help] -# ------------------------------------------------------------------------- - -TEXT_FILE := banner.txt -hello: ## [Help] Displays a banner - @echo "Reading lines from $(TEXT_FILE):" - @while IFS= read -r line; do \ - echo "$$line"; \ - done < $(TEXT_FILE) - -help: hello ## [Help] Show this help - @echo "" - @echo "Available Make targets:" - @awk 'BEGIN {FS = ":.*?## "}; /^[a-zA-Z_-]+:.*?## / { \ - split($$2, parts, "] "); \ - group = substr(parts[1], 2); \ - desc = parts[2]; \ - if (group != last_group) { \ - printf "\n\033[1m[%s]\033[0m\n", group; \ - last_group = group; \ - } \ - printf " \033[36m%-25s\033[0m %s\n", $$1, desc \ - }' $(MAKEFILE_LIST) +## help: Show the help. +.PHONY: help +help: + @echo "Usage: make " @echo "" + @echo "Targets:" + @fgrep "##" Makefile | fgrep -v fgrep | sed 's/##/ -/g' + + +## feature: Build all features +.PHONY: feature +feature: + mvn clean install -f parents/pom.xml + mvn clean install -f features/sdnr/wt/pom.xml + mvn clean install -f features/sdnr/odlux/pom.xml + +## dist: Build images +.PHONY: dist +dist: + mvn clean install -f distribution/oam-controller/pom.xml + mvn clean install -f distribution/oam-controller-web/pom.xml + +## all: Build features and images +.PHONY: all +all: feature dist \ No newline at end of file diff --git a/README.md b/README.md index d4ed8b5..053d7fb 100644 --- a/README.md +++ b/README.md @@ -54,3 +54,4 @@ This project is licensed under the Apache License 2.0 - see the [LICENSE](LICENS - 2 Github workflows are added for building the code - GERRIT_PROJECT needs special handling due to the repo naming convention - Test commit to check GHA triggering +- Test commit to check GHA triggering diff --git a/pom.xml b/pom.xml index 77a849b..bf89880 100755 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ O-RAN-SC :: ${project.groupId} :: ${project.artifactId} - parents + features/sdnr/wt features/sdnr/odlux distribution/oam-controller -- 2.16.6