From 66a2d46dbb9d3a6606ce42c9d570a8625e763566 Mon Sep 17 00:00:00 2001 From: jmarchel7bulls Date: Mon, 10 Jun 2024 12:25:43 +0200 Subject: [PATCH 1/3] transition from zuul to gha --- java-spring-boot-demo/.gitignore | 33 --------- java-spring-boot-demo/Dockerfile | 15 ---- java-spring-boot-demo/pom.xml | 42 ----------- .../com/example/demo/DemoApplication.java | 13 ---- .../java/com/example/demo/DemoController.java | 14 ---- .../src/main/resources/application.properties | 0 .../example/demo/DemoApplicationTests.java | 13 ---- zuul.d/jobs.yaml | 73 ------------------- zuul.d/project.yaml | 20 ----- 9 files changed, 223 deletions(-) delete mode 100644 java-spring-boot-demo/.gitignore delete mode 100644 java-spring-boot-demo/Dockerfile delete mode 100644 java-spring-boot-demo/pom.xml delete mode 100644 java-spring-boot-demo/src/main/java/com/example/demo/DemoApplication.java delete mode 100644 java-spring-boot-demo/src/main/java/com/example/demo/DemoController.java delete mode 100644 java-spring-boot-demo/src/main/resources/application.properties delete mode 100644 java-spring-boot-demo/src/test/java/com/example/demo/DemoApplicationTests.java delete mode 100644 zuul.d/jobs.yaml delete mode 100644 zuul.d/project.yaml diff --git a/java-spring-boot-demo/.gitignore b/java-spring-boot-demo/.gitignore deleted file mode 100644 index 549e00a..0000000 --- a/java-spring-boot-demo/.gitignore +++ /dev/null @@ -1,33 +0,0 @@ -HELP.md -target/ -!.mvn/wrapper/maven-wrapper.jar -!**/src/main/**/target/ -!**/src/test/**/target/ - -### STS ### -.apt_generated -.classpath -.factorypath -.project -.settings -.springBeans -.sts4-cache - -### IntelliJ IDEA ### -.idea -*.iws -*.iml -*.ipr - -### NetBeans ### -/nbproject/private/ -/nbbuild/ -/dist/ -/nbdist/ -/.nb-gradle/ -build/ -!**/src/main/**/build/ -!**/src/test/**/build/ - -### VS Code ### -.vscode/ diff --git a/java-spring-boot-demo/Dockerfile b/java-spring-boot-demo/Dockerfile deleted file mode 100644 index 427e30e..0000000 --- a/java-spring-boot-demo/Dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -# -# Build stage -# -FROM docker.io/library/maven:3.9.2-eclipse-temurin-17 AS build -COPY src /home/app/src -COPY pom.xml /home/app -RUN mvn -f /home/app/pom.xml clean package - -# -# Package stage -# -FROM docker.io/library/eclipse-temurin:17-jre -COPY --from=build /home/app/target/demo-0.0.1-SNAPSHOT.jar /usr/local/lib/demo.jar -EXPOSE 8080 -ENTRYPOINT ["java","-jar","/usr/local/lib/demo.jar"] diff --git a/java-spring-boot-demo/pom.xml b/java-spring-boot-demo/pom.xml deleted file mode 100644 index 76e0f0e..0000000 --- a/java-spring-boot-demo/pom.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - 4.0.0 - - org.springframework.boot - spring-boot-starter-parent - 3.1.0 - - - com.example - demo - 0.0.1-SNAPSHOT - demo - Demo project for Spring Boot - - 17 - - - - org.springframework.boot - spring-boot-starter - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-test - test - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - diff --git a/java-spring-boot-demo/src/main/java/com/example/demo/DemoApplication.java b/java-spring-boot-demo/src/main/java/com/example/demo/DemoApplication.java deleted file mode 100644 index 094d95b..0000000 --- a/java-spring-boot-demo/src/main/java/com/example/demo/DemoApplication.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.example.demo; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -@SpringBootApplication -public class DemoApplication { - - public static void main(String[] args) { - SpringApplication.run(DemoApplication.class, args); - } - -} diff --git a/java-spring-boot-demo/src/main/java/com/example/demo/DemoController.java b/java-spring-boot-demo/src/main/java/com/example/demo/DemoController.java deleted file mode 100644 index 61a5075..0000000 --- a/java-spring-boot-demo/src/main/java/com/example/demo/DemoController.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.example.demo; - -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -@RestController -public class DemoController { - - @RequestMapping("/") - public Object root() { - return null; - } - -} diff --git a/java-spring-boot-demo/src/main/resources/application.properties b/java-spring-boot-demo/src/main/resources/application.properties deleted file mode 100644 index e69de29..0000000 diff --git a/java-spring-boot-demo/src/test/java/com/example/demo/DemoApplicationTests.java b/java-spring-boot-demo/src/test/java/com/example/demo/DemoApplicationTests.java deleted file mode 100644 index eaa9969..0000000 --- a/java-spring-boot-demo/src/test/java/com/example/demo/DemoApplicationTests.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.example.demo; - -import org.junit.jupiter.api.Test; -import org.springframework.boot.test.context.SpringBootTest; - -@SpringBootTest -class DemoApplicationTests { - - @Test - void contextLoads() { - } - -} diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml deleted file mode 100644 index e244857..0000000 --- a/zuul.d/jobs.yaml +++ /dev/null @@ -1,73 +0,0 @@ -- job: - name: nebulous-resource-manager-build-container-images - parent: nebulous-build-container-images - dependencies: - - name: opendev-buildset-registry - soft: false - provides: - - nebulous-resource-manager-container-images - description: Build the container images. - files: &image_files - - ^zuul\.d/jobs\.yaml$ - - ^resource-discovery/ - vars: &image_vars - promote_container_image_job: nebulous-resource-manager-upload-container-images - container_images: - - context: resource-discovery - registry: quay.io - repository: quay.io/nebulous/resource-manager - namespace: nebulous - repo_shortname: resource-manager - repo_description: "" - -- job: - name: nebulous-resource-manager-upload-container-images - parent: nebulous-upload-container-images - dependencies: - - name: opendev-buildset-registry - soft: false - provides: - - nebulous-resource-manager-container-images - description: Build and upload the container images. - files: *image_files - vars: *image_vars - -- job: - name: nebulous-resource-manager-promote-container-images - parent: nebulous-promote-container-images - description: Promote previously uploaded container images. - files: *image_files - vars: *image_vars - -- job: - name: nebulous-resource-manager-hadolint - parent: nebulous-hadolint - description: Run Hadolint on Dockerfile(s). - vars: - dockerfiles: - - resource-discovery/Dockerfile - -- job: - name: nebulous-resource-manager-helm-lint - parent: nebulous-helm-lint - description: Run helm lint on Helm charts. - vars: - helm_charts: - - ./charts/nebulous-resource-manager - -- job: - name: nebulous-resource-manager-apply-helm-charts - parent: nebulous-apply-helm-charts - dependencies: - - name: opendev-buildset-registry - soft: false - - name: nebulous-resource-manager-build-container-images - soft: true - - name: nebulous-resource-manager-upload-container-images - soft: true - requires: - - nebulous-resource-manager-container-images - description: Deploy a Kubernetes cluster and apply charts. - vars: - helm_charts: - nebulous-resource-manager: ./charts/nebulous-resource-manager diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml deleted file mode 100644 index 7041cfa..0000000 --- a/zuul.d/project.yaml +++ /dev/null @@ -1,20 +0,0 @@ -- project: - check: - jobs: - - opendev-buildset-registry - - nebulous-resource-manager-helm-lint - - nebulous-resource-manager-build-container-images - - nebulous-resource-manager-hadolint - - nebulous-platform-apply-helm-charts - - nox-linters - gate: - jobs: - - opendev-buildset-registry - - nebulous-resource-manager-helm-lint - - nebulous-resource-manager-upload-container-images - - nebulous-resource-manager-hadolint - - nebulous-platform-apply-helm-charts - - nox-linters - promote: - jobs: - - nebulous-resource-manager-promote-container-images From 62dfb1871a13da79070f1dcbf2b2b4cb3a49317c Mon Sep 17 00:00:00 2001 From: jmarchel7bulls Date: Mon, 10 Jun 2024 12:30:45 +0200 Subject: [PATCH 2/3] add ci.yml --- .github/workflows/ci.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 .github/workflows/ci.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000..7f747f2 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,18 @@ +name: CI +on: + push: + branches: + - main + - r[1-9] + pull_request: + branches: + - main + - r[1-9] +jobs: + build-and-push-resource-discovery: + name: Build and push resource-discovery + uses: eu-nebulous/github-actions/.github/workflows/build-and-push-container-image.yml@main + with: + context: resource-discovery + image-name: security-manager + secrets: inherit From dd430e7e7a72dbbcae9e46335089f8e0148e8b49 Mon Sep 17 00:00:00 2001 From: jmarchel7bulls Date: Mon, 10 Jun 2024 12:32:23 +0200 Subject: [PATCH 3/3] small fix --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7f747f2..b6aebdd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,5 +14,5 @@ jobs: uses: eu-nebulous/github-actions/.github/workflows/build-and-push-container-image.yml@main with: context: resource-discovery - image-name: security-manager + image-name: resource-discovery secrets: inherit