.gitlab-ci.yml

@@ -5,18 +5,11 @@ stages:
   - upload
   - image
 
-.img: &img
-  image: "domaindrivenarchitecture/ddadevops-dind:4.7.2"
-  services:
-    - docker:dind
-  before_script:
-  - export RELEASE_ARTIFACT_TOKEN=$MEISSA_REPO_BUERO_RW
-  - export IMAGE_DOCKERHUB_USER=$DOCKERHUB_USER
-  - export IMAGE_DOCKERHUB_PASSWORD=$DOCKERHUB_PASSWORD
-  - export IMAGE_TAG=$CI_COMMIT_TAG
+services:
+  - docker:19.03.12-dind
 
 .cljs-job: &cljs
-  image: "domaindrivenarchitecture/ddadevops-clj-cljs:4.7.2"
+  image: domaindrivenarchitecture/shadow-cljs
   cache:
     key: ${CI_COMMIT_REF_SLUG}
     paths:
@@ -24,44 +17,38 @@ stages:
       - .shadow-cljs/
       - .m2
   before_script:
-  - export RELEASE_ARTIFACT_TOKEN=$MEISSA_REPO_BUERO_RW
-  - echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" > ~/.npmrc
-  - npm install
+    - echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" > ~/.npmrc
+    - npm install
 
-.clj-job: &clj
-  image: "domaindrivenarchitecture/ddadevops-clj-cljs:4.7.2"
+.clj-uploadjob: &clj
+  image: domaindrivenarchitecture/lein
   cache:
     key: ${CI_COMMIT_REF_SLUG}
     paths:
       - .m2
   before_script:
-  - export RELEASE_ARTIFACT_TOKEN=$MEISSA_REPO_BUERO_RW
-  - mkdir -p /root/.lein
-  - echo "{:auth {:repository-auth {#\"clojars\" {:username \"${CLOJARS_USER}\" :password \"${CLOJARS_TOKEN_DOMAINDRIVENARCHITECTURE}\" }}}}" > ~/.lein/profiles.clj
-
-.tag_only: &tag_only
-  rules:
-    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
-      when: never
-    - if: '$CI_COMMIT_TAG =~ /^[0-9]+\.[0-9]+\.[0-9]+$/'
-
-test-clj:
-  <<: *clj
-  stage: build_and_test
-  script:
-    - pyb test_clj
+    - mkdir -p /root/.lein
+    - echo "{:auth {:repository-auth {#\"clojars\" {:username \"${CLOJARS_USER}\" :password \"${CLOJARS_TOKEN_DOMAINDRIVENARCHITECTURE}\" }}}}" > ~/.lein/profiles.clj
 
 test-cljs:
   <<: *cljs
   stage: build_and_test
   script:
-    - pyb test_cljs
+    - shadow-cljs compile test
+    - node target/node-tests.js
+
+test-clj:
+  <<: *clj
+  stage: build_and_test
+  script:
+    - lein test
 
 test-schema:
   <<: *clj
   stage: build_and_test
   script:
-    - pyb test_schema
+    - lein uberjar
+    - java -jar target/uberjar/c4k-forgejo-standalone.jar src/test/resources/forgejo-test/valid-config.yaml src/test/resources/forgejo-test/valid-auth.yaml | kubeconform --kubernetes-version 1.19.0 --strict --skip Certificate -
   artifacts:
     paths:
       - target/uberjar
@@ -70,7 +57,8 @@ report-frontend:
   <<: *cljs
   stage: package
   script:
-    - pyb report_frontend
+    - mkdir -p target/frontend-build
+    - shadow-cljs run shadow.cljs.build-report frontend target/frontend-build/build-report.html
   artifacts:
     paths:
       - target/frontend-build/build-report.html
@@ -79,7 +67,11 @@ package-frontend:
   <<: *cljs
   stage: package
   script:
-    - pyb package_frontend
+    - mkdir -p target/frontend-build
+    - shadow-cljs release frontend
+    - cp public/js/main.js target/frontend-build/c4k-forgejo.js
+    - sha256sum target/frontend-build/c4k-forgejo.js > target/frontend-build/c4k-forgejo.js.sha256
+    - sha512sum target/frontend-build/c4k-forgejo.js > target/frontend-build/c4k-forgejo.js.sha512
   artifacts:
     paths:
       - target/frontend-build
@@ -88,35 +80,53 @@ package-uberjar:
   <<: *clj
   stage: package
   script:
-    - pyb package_uberjar
+    - lein uberjar
+    - sha256sum target/uberjar/c4k-forgejo-standalone.jar > target/uberjar/c4k-forgejo-standalone.jar.sha256
+    - sha512sum target/uberjar/c4k-forgejo-standalone.jar > target/uberjar/c4k-forgejo-standalone.jar.sha512
   artifacts:
     paths:
       - target/uberjar
 
-release-to-clojars:
+upload-clj-release:
   <<: *clj
-  <<: *tag_only
   stage: upload
+  rules:
+    - if: '$CI_COMMIT_TAG != null'
   script:
-    - pyb upload_clj
+    - lein deploy
 
-release-to-forgejo:
-  <<: *clj
-  <<: *tag_only
+release:
+  image: registry.gitlab.com/gitlab-org/release-cli:latest
   stage: upload
+  rules:
+    - if: '$CI_COMMIT_TAG != null'
+  artifacts:
+    paths:
+      - target/uberjar
+      - target/frontend-build
   script:
-    - pyb publish_artifacts
+    - apk --no-cache add curl
+    - |
+      release-cli create --name "Release $CI_COMMIT_TAG" --tag-name $CI_COMMIT_TAG \
+        --assets-link "{\"name\":\"c4k-forgejo-standalone.jar\",\"url\":\"https://gitlab.com/domaindrivenarchitecture/c4k-forgejo/-/jobs/${CI_JOB_ID}/artifacts/file/target/uberjar/c4k-forgejo-standalone.jar\"}" \
+        --assets-link "{\"name\":\"c4k-forgejo-standalone.jar.sha256\",\"url\":\"https://gitlab.com/domaindrivenarchitecture/c4k-forgejo/-/jobs/${CI_JOB_ID}/artifacts/file/target/uberjar/c4k-forgejo-standalone.jar.sha256\"}" \
+        --assets-link "{\"name\":\"c4k-forgejo-standalone.jar.sha512\",\"url\":\"https://gitlab.com/domaindrivenarchitecture/c4k-forgejo/-/jobs/${CI_JOB_ID}/artifacts/file/target/uberjar/c4k-forgejo-standalone.jar.sha512\"}" \
+        --assets-link "{\"name\":\"c4k-forgejo.js\",\"url\":\"https://gitlab.com/domaindrivenarchitecture/c4k-forgejo/-/jobs/${CI_JOB_ID}/artifacts/file/target/frontend-build/c4k-forgejo.js\"}" \
+        --assets-link "{\"name\":\"c4k-forgejo.js.sha256\",\"url\":\"https://gitlab.com/domaindrivenarchitecture/c4k-forgejo/-/jobs/${CI_JOB_ID}/artifacts/file/target/frontend-build/c4k-forgejo.js.sha256\"}" \
+        --assets-link "{\"name\":\"c4k-forgejo.js.sha512\",\"url\":\"https://gitlab.com/domaindrivenarchitecture/c4k-forgejo/-/jobs/${CI_JOB_ID}/artifacts/file/target/frontend-build/c4k-forgejo.js.sha512\"}" \
 
-forgejo-backup-image-publish:
-  <<: *img
-  <<: *tag_only
+forgejo-backup-image-test-publish:
+  image: domaindrivenarchitecture/devops-build:latest
   stage: image
+  rules:
+    - if: '$CI_COMMIT_TAG != null'
   script:
-    - cd infrastructure/backup && pyb image publish
+    - cd infrastructure/docker-backup && pyb image test publish
 
-forgejo-federated-image-publish:
-  <<: *img
-  <<: *tag_only
+forgejo-federated-image-test-publish:
+  image: domaindrivenarchitecture/devops-build:latest
   stage: image
+  rules:
+    - if: '$CI_COMMIT_TAG != null'
   script:
-    - cd infrastructure/federated && pyb image publish
+    - cd infrastructure/docker-federated && pyb image test publish

build.py

@@ -1,16 +1,15 @@
 from os import environ
 from subprocess import run
-from pybuilder.core import init, task
+from pybuilder.core import task, init
 from ddadevops import *
 
-default_task = "dev"
-name = 'c4k-forgejo'
-MODULE = 'not-used'
-PROJECT_ROOT_PATH = '.'
+name = 'c4k'
+MODULE = 'forgejo'
+PROJECT_ROOT_PATH = '..'
 
 @init
 def initialize(project):
-    project.build_depends_on("ddadevops>=4.7.0")
+    project.build_depends_on("ddadevops>=4.0.0")
 
     input = {
         "name": name,
@@ -20,18 +19,7 @@ def initialize(project):
         "build_types": [],
         "mixin_types": ["RELEASE"],
         "release_primary_build_file": "project.clj",
-        "release_secondary_build_files": [
-            "package.json",
-            "infrastructure/backup/build.py",
-            "infrastructure/federated/build.py",
-            ],
-        "release_artifact_server_url": "https://repo.prod.meissa.de",
-        "release_organisation": "meissa",
-        "release_repository_name": name,
-        "release_artifacts": [
-            "target/uberjar/c4k-forgejo-standalone.jar",
-            "target/frontend-build/c4k-forgejo.js",
-        ],
+        "release_secondary_build_files": ["package.json"],
     }
     
     build = ReleaseMixin(project, input)
@@ -39,141 +27,48 @@ def initialize(project):
 
 
 @task
-def test_clj(project):
-    run("lein test", shell=True, check=True)
-
-
-@task
-def test_cljs(project):
-    run("shadow-cljs compile test", shell=True, check=True)
-    run("node target/node-tests.js", shell=True, check=True)
-
-
-@task
-def test_schema(project):
-    run("lein uberjar", shell=True, check=True)
-    run(
-        "java -jar target/uberjar/c4k-forgejo-standalone.jar "
-        + "src/test/resources/forgejo-test/valid-config.yaml "
-        + "src/test/resources/forgejo-test/valid-auth.yaml | "
-        + "kubeconform --kubernetes-version 1.23.0 --strict --skip Certificate -",
-        shell=True,
-        check=True,
-    )
-
-
-@task
-def report_frontend(project):
-    run("mkdir -p target/frontend-build", shell=True, check=True)
-    run(
-        "shadow-cljs run shadow.cljs.build-report frontend target/frontend-build/build-report.html",
-        shell=True,
-        check=True,
-    )
-
-
-@task
-def package_frontend(project):
-    run("mkdir -p target/frontend-build", shell=True, check=True)
-    run("shadow-cljs release frontend", shell=True, check=True)
-    run(
-        "cp public/js/main.js target/frontend-build/c4k-forgejo.js",
-        shell=True,
-        check=True,
-    )
-    run(
-        "sha256sum target/frontend-build/c4k-forgejo.js > target/frontend-build/c4k-forgejo.js.sha256",
-        shell=True,
-        check=True,
-    )
-    run(
-        "sha512sum target/frontend-build/c4k-forgejo.js > target/frontend-build/c4k-forgejo.js.sha512",
-        shell=True,
-        check=True,
-    )
-
-
-@task
-def package_uberjar(project):
-    run(
-        "sha256sum target/uberjar/c4k-forgejo-standalone.jar > target/uberjar/c4k-forgejo-standalone.jar.sha256",
-        shell=True,
-        check=True,
-    )
-    run(
-        "sha512sum target/uberjar/c4k-forgejo-standalone.jar > target/uberjar/c4k-forgejo-standalone.jar.sha512",
-        shell=True,
-        check=True,
-    )
-
-
-@task
-def upload_clj(project):
-    run("lein deploy", shell=True, check=True)
-
-
-@task
-def lint(project):
-    run(
-        "lein eastwood",
-        shell=True,
-        check=True,
-    )
-    run(
-        "lein ancient check",
-        shell=True,
-        check=True,
-    )
-
-
-@task
-def patch(project):
-    linttest(project, "PATCH")
-    release(project)
-
-
-@task
-def minor(project):
-    linttest(project, "MINOR")
-    release(project)
-
-
-@task
-def major(project):
-    linttest(project, "MAJOR")
-    release(project)
-
-
-@task
-def dev(project):
-    linttest(project, "NONE")
-
-
-@task
-def prepare(project):
+def prepare_release(project):
     build = get_devops_build(project)
     build.prepare_release()
 
-
 @task
-def tag(project):
+def tag_bump_and_push_release(project):
     build = get_devops_build(project)
     build.tag_bump_and_push_release()
 
 @task
-def publish_artifacts(project):
-    build = get_devops_build(project)
-    build.publish_artifacts()
+def patch(project):
+    build_all(project, "PATCH")
 
-def release(project):
-    prepare(project)
-    tag(project)
+@task
+def minor(project):
+    build_all(project, "MINOR")
 
+@task
+def major(project):
+    build_all(project, "MAJOR")
     
-def linttest(project, release_type):
+@task
+def dev(project):
+    build_all(project, "NONE")
+
+@task
+def test(project):
+    run("lein test", shell=True)
+
+@task
+def build_it(project):
+    run("lein uberjar", shell=True)
+
+@task
+def publish(project):
+    run("lein deploy", shell=True)
+
+def build_all(project, release_type):
     build = get_devops_build(project)
     build.update_release_type(release_type)
-    test_clj(project)
-    test_cljs(project)
-    test_schema(project)
-    lint(project)
+    test(project)
+    prepare_release(project)
+    build_it(project)
+    tag_bump_and_push_release(project)
+

infrastructure/docker-backup/build.py

@@ -1,20 +1,14 @@
 from os import environ
-from datetime import datetime
 from pybuilder.core import task, init
 from ddadevops import *
 
-name = "c4k-forgejo"
-MODULE = "backup"
+name = "c4k-forgejo-backup"
+MODULE = "docker"
 PROJECT_ROOT_PATH = "../.."
-version = "3.0.4-SNAPSHOT"
 
 
 @init
 def initialize(project):
-    image_tag = version
-    if "dev" in image_tag:
-        image_tag += datetime.now().strftime("%Y-%m-%d-%H-%M-%S")
-
     input = {
         "name": name,
         "module": MODULE,
@@ -22,11 +16,9 @@ def initialize(project):
         "project_root_path": PROJECT_ROOT_PATH,
         "build_types": ["IMAGE"],
         "mixin_types": [],
-        "image_naming": "NAME_AND_MODULE",
-        "image_tag": f"{image_tag}",
     }
 
-    project.build_depends_on("ddadevops>=4.7.0")
+    project.build_depends_on("ddadevops>=4.0.0-dev")
 
     build = DevopsImageBuild(project, input)
     build.initialize_build_dir()
@@ -44,14 +36,14 @@ def drun(project):
     build.drun()
 
 
-@task
-def test(project):
-    build = get_devops_build(project)
-    build.test()
-
-
 @task
 def publish(project):
     build = get_devops_build(project)
     build.dockerhub_login()
     build.dockerhub_publish()
+
+
+@task
+def test(project):
+    build = get_devops_build(project)
+    build.test()

infrastructure/docker-federated/build.py

@@ -1,19 +1,13 @@
 from os import environ
-from datetime import datetime
 from pybuilder.core import task, init
 from ddadevops import *
 
-name = 'c4k-forgejo'
-MODULE = 'federated'
+name = 'c4k-forgejo-federated'
+MODULE = 'docker'
 PROJECT_ROOT_PATH = '../..'
-version = "3.0.4-SNAPSHOT"
 
 @init
 def initialize(project):
-    image_tag = version
-    if "dev" in image_tag:
-        image_tag += datetime.now().strftime("%Y-%m-%d-%H-%M-%S")
-
     input = {
         "name": name,
         "module": MODULE,
@@ -21,11 +15,9 @@ def initialize(project):
         "project_root_path": PROJECT_ROOT_PATH,
         "build_types": ["IMAGE"],
         "mixin_types": [],
-        "image_naming": "NAME_AND_MODULE",
-        "image_tag": f"{image_tag}",
     }
 
-    project.build_depends_on("ddadevops>=4.7.0")
+    project.build_depends_on('ddadevops>=4.0.0-dev')
 
     build = DevopsImageBuild(project, input)
     build.initialize_build_dir()
@@ -41,15 +33,13 @@ def drun(project):
     build = get_devops_build(project)
     build.drun()
 
-
-@task
-def test(project):
-    build = get_devops_build(project)
-    build.test()
-
-
 @task
 def publish(project):
     build = get_devops_build(project)
     build.dockerhub_login()
     build.dockerhub_publish()
+
+@task
+def test(project):
+    build = get_devops_build(project)
+    build.test()