Merge "Improve jenkins log usability"
diff --git a/.github/workflows/gerrit-merge.yaml b/.github/workflows/gerrit-merge.yaml
new file mode 100644
index 0000000..79b01c4
--- /dev/null
+++ b/.github/workflows/gerrit-merge.yaml
@@ -0,0 +1,68 @@
+---
+name: Call Composed ci-management Merge
+
+# yamllint disable-line rule:truthy
+on:
+ workflow_dispatch:
+ inputs:
+ GERRIT_BRANCH:
+ description: "Branch that change is against"
+ required: true
+ type: string
+ GERRIT_CHANGE_ID:
+ description: "The ID for the change"
+ required: true
+ type: string
+ GERRIT_CHANGE_NUMBER:
+ description: "The Gerrit number"
+ required: true
+ type: string
+ GERRIT_CHANGE_URL:
+ description: "URL to the change"
+ required: true
+ type: string
+ GERRIT_EVENT_TYPE:
+ description: "Type of Gerrit event"
+ required: true
+ type: string
+ GERRIT_PATCHSET_NUMBER:
+ description: "The patch number for the change"
+ required: true
+ type: string
+ GERRIT_PATCHSET_REVISION:
+ description: "The revision sha"
+ required: true
+ type: string
+ GERRIT_PROJECT:
+ description: "Project in Gerrit"
+ required: true
+ type: string
+ GERRIT_REFSPEC:
+ description: "Gerrit refspec of change"
+ required: true
+ type: string
+
+concurrency:
+ # yamllint disable-line rule:line-length
+ group: ci-management-${{ github.workflow }}-${{ github.event.inputs.GERRIT_CHANGE_ID || github.run_id }}
+ cancel-in-progress: true
+
+permissions: read-all
+
+jobs:
+ call-composed-ci-man-merge:
+ # yamllint disable-line rule:line-length
+ uses: lfit/releng-reusable-workflows/.github/workflows/gerrit-ci-management-merge.yaml@cfe55838e3aac24c19b250029ba9d4f503c54fc6
+ with:
+ GERRIT_BRANCH: ${{ inputs.GERRIT_BRANCH }}
+ GERRIT_CHANGE_ID: ${{ inputs.GERRIT_CHANGE_ID }}
+ GERRIT_CHANGE_NUMBER: ${{ inputs.GERRIT_CHANGE_NUMBER }}
+ GERRIT_CHANGE_URL: ${{ inputs.GERRIT_CHANGE_URL }}
+ GERRIT_EVENT_TYPE: ${{ inputs.GERRIT_EVENT_TYPE }}
+ GERRIT_PATCHSET_NUMBER: ${{ inputs.GERRIT_PATCHSET_NUMBER }}
+ GERRIT_PATCHSET_REVISION: ${{ inputs.GERRIT_PATCHSET_REVISION }}
+ GERRIT_PROJECT: ${{ inputs.GERRIT_PROJECT }}
+ GERRIT_REFSPEC: ${{ inputs.GERRIT_REFSPEC }}
+ secrets:
+ GERRIT_SSH_PRIVKEY: ${{ secrets.GERRIT_SSH_PRIVKEY }}
+ JOBBUILDER_PROD_PSW: ${{ secrets.JOBBUILDER_PROD_PSW }}
diff --git a/jjb/ci-management/ci-management.yaml b/jjb/ci-management/ci-management.yaml
deleted file mode 100644
index 754a051..0000000
--- a/jjb/ci-management/ci-management.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-- project:
- archive-artifacts: '**/*.log'
- branch: 'master'
- build-timeout: '60'
- build-node: 'ubuntu18.04-basebuild-1c-1g'
-
- jobs:
- - gerrit-jjb-merge
-
- name: ci-management-jobs
- project: 'ci-management'
- project-name: 'ci-management'
-
- jjb-version: 6.4.1
-
-# [EOF]