diff --git a/.drone/drone.jsonnet b/.drone/drone.jsonnet index c8e15bb5a6f84..2c97b836c8a6e 100644 --- a/.drone/drone.jsonnet +++ b/.drone/drone.jsonnet @@ -177,16 +177,6 @@ local promtail_win() = pipeline('promtail-windows') { local querytee() = pipeline('querytee-amd64') + arch_image('amd64', 'main') { steps+: [ - // dry run for everything that is not tag or main - docker('amd64', 'querytee') { - depends_on: ['image-tag'], - when: onPRs, - settings+: { - dry_run: true, - repo: 'grafana/loki-query-tee', - }, - }, - ] + [ // publish for tag or main docker('amd64', 'querytee') { depends_on: ['image-tag'], @@ -196,21 +186,10 @@ local querytee() = pipeline('querytee-amd64') + arch_image('amd64', 'main') { }, }, ], - depends_on: ['check'], }; local fluentbit() = pipeline('fluent-bit-amd64') + arch_image('amd64', 'main') { steps+: [ - // dry run for everything that is not tag or main - clients_docker('amd64', 'fluent-bit') { - depends_on: ['image-tag'], - when: onPRs, - settings+: { - dry_run: true, - repo: 'grafana/fluent-bit-plugin-loki', - }, - }, - ] + [ // publish for tag or main clients_docker('amd64', 'fluent-bit') { depends_on: ['image-tag'], @@ -220,21 +199,10 @@ local fluentbit() = pipeline('fluent-bit-amd64') + arch_image('amd64', 'main') { }, }, ], - depends_on: ['check'], }; local fluentd() = pipeline('fluentd-amd64') + arch_image('amd64', 'main') { steps+: [ - // dry run for everything that is not tag or main - clients_docker('amd64', 'fluentd') { - depends_on: ['image-tag'], - when: onPRs, - settings+: { - dry_run: true, - repo: 'grafana/fluent-plugin-loki', - }, - }, - ] + [ // publish for tag or main clients_docker('amd64', 'fluentd') { depends_on: ['image-tag'], @@ -244,21 +212,10 @@ local fluentd() = pipeline('fluentd-amd64') + arch_image('amd64', 'main') { }, }, ], - depends_on: ['check'], }; local logstash() = pipeline('logstash-amd64') + arch_image('amd64', 'main') { steps+: [ - // dry run for everything that is not tag or main - clients_docker('amd64', 'logstash') { - depends_on: ['image-tag'], - when: onPRs, - settings+: { - dry_run: true, - repo: 'grafana/logstash-output-loki', - }, - }, - ] + [ // publish for tag or main clients_docker('amd64', 'logstash') { depends_on: ['image-tag'], @@ -268,20 +225,10 @@ local logstash() = pipeline('logstash-amd64') + arch_image('amd64', 'main') { }, }, ], - depends_on: ['check'], }; local promtail(arch) = pipeline('promtail-' + arch) + arch_image(arch) { steps+: [ - // dry run for everything that is not tag or main - clients_docker(arch, 'promtail') { - depends_on: ['image-tag'], - when: onPRs, - settings+: { - dry_run: true, - }, - }, - ] + [ // publish for tag or main clients_docker(arch, 'promtail') { depends_on: ['image-tag'], @@ -289,7 +236,6 @@ local promtail(arch) = pipeline('promtail-' + arch) + arch_image(arch) { settings+: {}, }, ], - depends_on: ['check'], }; local lambda_promtail(arch) = pipeline('lambda-promtail-' + arch) + arch_image(arch) { @@ -297,15 +243,6 @@ local lambda_promtail(arch) = pipeline('lambda-promtail-' + arch) + arch_image(a steps+: [ skipStep, - // dry run for everything that is not tag or main - lambda_promtail_ecr('lambda-promtail') { - depends_on: ['image-tag', skipStep.name], - when: onPRs, - settings+: { - dry_run: true, - }, - }, - ] + [ // publish for tag or main lambda_promtail_ecr('lambda-promtail') { depends_on: ['image-tag'], @@ -313,20 +250,10 @@ local lambda_promtail(arch) = pipeline('lambda-promtail-' + arch) + arch_image(a settings+: {}, }, ], - depends_on: ['check'], }; local lokioperator(arch) = pipeline('lokioperator-' + arch) + arch_image(arch) { steps+: [ - // dry run for everything that is not tag or main - docker_operator(arch, 'loki-operator') { - depends_on: ['image-tag'], - when: onPRs, - settings+: { - dry_run: true, - }, - }, - ] + [ // publish for tag or main docker_operator(arch, 'loki-operator') { depends_on: ['image-tag'], @@ -334,21 +261,10 @@ local lokioperator(arch) = pipeline('lokioperator-' + arch) + arch_image(arch) { settings+: {}, }, ], - depends_on: ['check'], }; local logql_analyzer() = pipeline('logql-analyzer') + arch_image('amd64') { steps+: [ - // dry run for everything that is not tag or main - docker('amd64', 'logql-analyzer') { - depends_on: ['image-tag'], - when: onPRs, - settings+: { - dry_run: true, - repo: 'grafana/logql-analyzer', - }, - }, - ] + [ // publish for tag or main docker('amd64', 'logql-analyzer') { depends_on: ['image-tag'], @@ -358,21 +274,10 @@ local logql_analyzer() = pipeline('logql-analyzer') + arch_image('amd64') { }, }, ], - depends_on: ['check'], }; local multiarch_image(arch) = pipeline('docker-' + arch) + arch_image(arch) { steps+: [ - // dry run for everything that is not tag or main - docker(arch, app) { - depends_on: ['image-tag'], - when: onPRs, - settings+: { - dry_run: true, - }, - } - for app in apps - ] + [ // publish for tag or main docker(arch, app) { depends_on: ['image-tag'], @@ -381,7 +286,6 @@ local multiarch_image(arch) = pipeline('docker-' + arch) + arch_image(arch) { } for app in apps ], - depends_on: ['check'], }; local manifest(apps) = pipeline('manifest') { @@ -535,60 +439,6 @@ local manifest_ecr(apps, archs) = pipeline('manifest-ecr') { }, ], }, - pipeline('check') { - workspace: { - base: '/src', - path: 'loki', - }, - steps: [ - make('check-drone-drift', container=false) { depends_on: ['clone'] }, - make('check-generated-files', container=false) { depends_on: ['clone'] }, - run('clone-target-branch', commands=[ - 'cd ..', - 'echo "cloning "$DRONE_TARGET_BRANCH ', - 'git clone -b $DRONE_TARGET_BRANCH $CI_REPO_REMOTE loki-target-branch', - 'cd -', - ]) { depends_on: ['clone'], when: onPRs }, - make('test', container=false) { depends_on: ['clone-target-branch', 'check-generated-files'] }, - run('test-target-branch', commands=['cd ../loki-target-branch', 'BUILD_IN_CONTAINER=false make test']) { depends_on: ['clone-target-branch'], when: onPRs }, - make('compare-coverage', container=false, args=[ - 'old=../loki-target-branch/test_results.txt', - 'new=test_results.txt', - 'packages=ingester,distributor,querier,querier/queryrange,iter,storage,chunkenc,logql,loki', - '> diff.txt', - ]) { depends_on: ['test', 'test-target-branch'], when: onPRs }, - run('report-coverage', commands=[ - "total_diff=$(sed 's/%//' diff.txt | awk '{sum+=$3;}END{print sum;}')", - 'if [ $total_diff = 0 ]; then exit 0; fi', - "pull=$(echo $CI_COMMIT_REF | awk -F '/' '{print $3}')", - "body=$(jq -Rs '{body: . }' diff.txt)", - 'curl -X POST -u $USER:$TOKEN -H "Accept: application/vnd.github.v3+json" https://api.github.com/repos/grafana/loki/issues/$pull/comments -d "$body" > /dev/null', - ], env={ - USER: 'grafanabot', - TOKEN: { from_secret: github_secret.name }, - }) { depends_on: ['compare-coverage'], when: onPRs }, - make('lint', container=false) { depends_on: ['check-generated-files'] }, - make('check-mod', container=false) { depends_on: ['test', 'lint'] }, - { - name: 'shellcheck', - image: 'koalaman/shellcheck-alpine:stable', - commands: ['apk add make bash && make lint-scripts'], - }, - make('loki', container=false) { depends_on: ['check-generated-files'] }, - make('check-doc', container=false) { depends_on: ['loki'] }, - make('validate-example-configs', container=false) { depends_on: ['loki'] }, - make('check-example-config-doc', container=false) { depends_on: ['clone'] }, - { - name: 'build-docs-website', - image: 'grafana/docs-base:latest', - commands: [ - 'mkdir -p /hugo/content/docs/loki/latest', - 'cp -r docs/sources/* /hugo/content/docs/loki/latest/', - 'cd /hugo && make prod', - ], - }, - ], - }, pipeline('mixins') { workspace: { base: '/src', @@ -751,109 +601,6 @@ local manifest_ecr(apps, archs) = pipeline('manifest-ecr') { }, promtail_win(), logql_analyzer(), - pipeline('release') { - trigger+: { - event: ['pull_request', 'tag'], - }, - depends_on+: ['check'], - image_pull_secrets: [pull_secret.name], - volumes+: [ - { - name: 'cgroup', - host: { - path: '/sys/fs/cgroup', - }, - }, - { - name: 'docker', - host: { - path: '/var/run/docker.sock', - }, - }, - ], - // Launch docker images with systemd - services: [ - { - name: 'systemd-debian', - image: 'jrei/systemd-debian:12', - volumes: [ - { - name: 'cgroup', - path: '/sys/fs/cgroup', - }, - ], - privileged: true, - }, - { - name: 'systemd-centos', - image: 'jrei/systemd-centos:8', - volumes: [ - { - name: 'cgroup', - path: '/sys/fs/cgroup', - }, - ], - privileged: true, - }, - ], - // Package and test the packages - steps: [ - skipMissingSecretPipelineStep(gpg_private_key.name), // Needs GPG keys to run - { - name: 'fetch-tags', - image: 'alpine', - commands: [ - 'apk add --no-cache bash git', - 'git fetch origin --tags', - ], - }, - run('write-key', - commands=['printf "%s" "$NFPM_SIGNING_KEY" > $NFPM_SIGNING_KEY_FILE'], - env={ - NFPM_SIGNING_KEY: { from_secret: gpg_private_key.name }, - NFPM_SIGNING_KEY_FILE: '/drone/src/private-key.key', - }), - run('test packaging', - commands=[ - 'make BUILD_IN_CONTAINER=false packages', - ], - env={ - NFPM_PASSPHRASE: { from_secret: gpg_passphrase.name }, - NFPM_SIGNING_KEY_FILE: '/drone/src/private-key.key', - }), - { - name: 'test deb package', - image: 'docker', - commands: ['./tools/packaging/verify-deb-install.sh'], - volumes: [ - { - name: 'docker', - path: '/var/run/docker.sock', - }, - ], - privileged: true, - }, - { - name: 'test rpm package', - image: 'docker', - commands: ['./tools/packaging/verify-rpm-install.sh'], - volumes: [ - { - name: 'docker', - path: '/var/run/docker.sock', - }, - ], - privileged: true, - }, - run('publish', - commands=['make BUILD_IN_CONTAINER=false publish'], - env={ - GITHUB_TOKEN: { from_secret: github_secret.name }, - NFPM_PASSPHRASE: { from_secret: gpg_passphrase.name }, - NFPM_SIGNING_KEY_FILE: '/drone/src/private-key.key', - }) { when: { event: ['tag'] } }, - ], - }, pipeline('docker-driver') { trigger+: onTagOrMain, steps: [ diff --git a/.drone/drone.yml b/.drone/drone.yml index a2722cc076602..064123d759f4d 100644 --- a/.drone/drone.yml +++ b/.drone/drone.yml @@ -86,149 +86,6 @@ workspace: path: loki --- kind: pipeline -name: check -steps: -- commands: - - make BUILD_IN_CONTAINER=false check-drone-drift - depends_on: - - clone - environment: {} - image: grafana/loki-build-image:0.29.3-go1.20.10 - name: check-drone-drift -- commands: - - make BUILD_IN_CONTAINER=false check-generated-files - depends_on: - - clone - environment: {} - image: grafana/loki-build-image:0.29.3-go1.20.10 - name: check-generated-files -- commands: - - cd .. - - 'echo "cloning "$DRONE_TARGET_BRANCH ' - - git clone -b $DRONE_TARGET_BRANCH $CI_REPO_REMOTE loki-target-branch - - cd - - depends_on: - - clone - environment: {} - image: grafana/loki-build-image:0.29.3-go1.20.10 - name: clone-target-branch - when: - event: - - pull_request -- commands: - - make BUILD_IN_CONTAINER=false test - depends_on: - - clone-target-branch - - check-generated-files - environment: {} - image: grafana/loki-build-image:0.29.3-go1.20.10 - name: test -- commands: - - cd ../loki-target-branch - - BUILD_IN_CONTAINER=false make test - depends_on: - - clone-target-branch - environment: {} - image: grafana/loki-build-image:0.29.3-go1.20.10 - name: test-target-branch - when: - event: - - pull_request -- commands: - - make BUILD_IN_CONTAINER=false compare-coverage old=../loki-target-branch/test_results.txt - new=test_results.txt packages=ingester,distributor,querier,querier/queryrange,iter,storage,chunkenc,logql,loki - > diff.txt - depends_on: - - test - - test-target-branch - environment: {} - image: grafana/loki-build-image:0.29.3-go1.20.10 - name: compare-coverage - when: - event: - - pull_request -- commands: - - total_diff=$(sed 's/%//' diff.txt | awk '{sum+=$3;}END{print sum;}') - - if [ $total_diff = 0 ]; then exit 0; fi - - pull=$(echo $CI_COMMIT_REF | awk -F '/' '{print $3}') - - 'body=$(jq -Rs ''{body: . }'' diff.txt)' - - 'curl -X POST -u $USER:$TOKEN -H "Accept: application/vnd.github.v3+json" https://api.github.com/repos/grafana/loki/issues/$pull/comments - -d "$body" > /dev/null' - depends_on: - - compare-coverage - environment: - TOKEN: - from_secret: github_token - USER: grafanabot - image: grafana/loki-build-image:0.29.3-go1.20.10 - name: report-coverage - when: - event: - - pull_request -- commands: - - make BUILD_IN_CONTAINER=false lint - depends_on: - - check-generated-files - environment: {} - image: grafana/loki-build-image:0.29.3-go1.20.10 - name: lint -- commands: - - make BUILD_IN_CONTAINER=false check-mod - depends_on: - - test - - lint - environment: {} - image: grafana/loki-build-image:0.29.3-go1.20.10 - name: check-mod -- commands: - - apk add make bash && make lint-scripts - image: koalaman/shellcheck-alpine:stable - name: shellcheck -- commands: - - make BUILD_IN_CONTAINER=false loki - depends_on: - - check-generated-files - environment: {} - image: grafana/loki-build-image:0.29.3-go1.20.10 - name: loki -- commands: - - make BUILD_IN_CONTAINER=false check-doc - depends_on: - - loki - environment: {} - image: grafana/loki-build-image:0.29.3-go1.20.10 - name: check-doc -- commands: - - make BUILD_IN_CONTAINER=false validate-example-configs - depends_on: - - loki - environment: {} - image: grafana/loki-build-image:0.29.3-go1.20.10 - name: validate-example-configs -- commands: - - make BUILD_IN_CONTAINER=false check-example-config-doc - depends_on: - - clone - environment: {} - image: grafana/loki-build-image:0.29.3-go1.20.10 - name: check-example-config-doc -- commands: - - mkdir -p /hugo/content/docs/loki/latest - - cp -r docs/sources/* /hugo/content/docs/loki/latest/ - - cd /hugo && make prod - image: grafana/docs-base:latest - name: build-docs-website -trigger: - ref: - - refs/heads/main - - refs/heads/k??? - - refs/tags/v* - - refs/pull/*/head -workspace: - base: /src - path: loki ---- -kind: pipeline name: mixins steps: - commands: @@ -280,8 +137,6 @@ workspace: base: /src path: loki --- -depends_on: -- check kind: pipeline name: docker-amd64 platform: @@ -294,51 +149,6 @@ steps: - echo $(./tools/image-tag)-amd64 > .tags image: alpine name: image-tag -- depends_on: - - image-tag - image: plugins/docker - name: build-loki-image - settings: - dockerfile: cmd/loki/Dockerfile - dry_run: true - password: - from_secret: docker_password - repo: grafana/loki - username: - from_secret: docker_username - when: - event: - - pull_request -- depends_on: - - image-tag - image: plugins/docker - name: build-loki-canary-image - settings: - dockerfile: cmd/loki-canary/Dockerfile - dry_run: true - password: - from_secret: docker_password - repo: grafana/loki-canary - username: - from_secret: docker_username - when: - event: - - pull_request -- depends_on: - - image-tag - image: plugins/docker - name: build-logcli-image - settings: - dockerfile: cmd/logcli/Dockerfile - dry_run: true - password: - from_secret: docker_password - repo: grafana/logcli - username: - from_secret: docker_username - when: - event: - - pull_request - depends_on: - image-tag image: plugins/docker @@ -394,8 +204,6 @@ trigger: - refs/tags/v* - refs/pull/*/head --- -depends_on: -- check kind: pipeline name: docker-arm64 platform: @@ -408,51 +216,6 @@ steps: - echo $(./tools/image-tag)-arm64 > .tags image: alpine name: image-tag -- depends_on: - - image-tag - image: plugins/docker - name: build-loki-image - settings: - dockerfile: cmd/loki/Dockerfile - dry_run: true - password: - from_secret: docker_password - repo: grafana/loki - username: - from_secret: docker_username - when: - event: - - pull_request -- depends_on: - - image-tag - image: plugins/docker - name: build-loki-canary-image - settings: - dockerfile: cmd/loki-canary/Dockerfile - dry_run: true - password: - from_secret: docker_password - repo: grafana/loki-canary - username: - from_secret: docker_username - when: - event: - - pull_request -- depends_on: - - image-tag - image: plugins/docker - name: build-logcli-image - settings: - dockerfile: cmd/logcli/Dockerfile - dry_run: true - password: - from_secret: docker_password - repo: grafana/logcli - username: - from_secret: docker_username - when: - event: - - pull_request - depends_on: - image-tag image: plugins/docker @@ -508,8 +271,6 @@ trigger: - refs/tags/v* - refs/pull/*/head --- -depends_on: -- check kind: pipeline name: docker-arm platform: @@ -522,51 +283,6 @@ steps: - echo $(./tools/image-tag)-arm > .tags image: alpine name: image-tag -- depends_on: - - image-tag - image: plugins/docker:linux-arm - name: build-loki-image - settings: - dockerfile: cmd/loki/Dockerfile - dry_run: true - password: - from_secret: docker_password - repo: grafana/loki - username: - from_secret: docker_username - when: - event: - - pull_request -- depends_on: - - image-tag - image: plugins/docker:linux-arm - name: build-loki-canary-image - settings: - dockerfile: cmd/loki-canary/Dockerfile - dry_run: true - password: - from_secret: docker_password - repo: grafana/loki-canary - username: - from_secret: docker_username - when: - event: - - pull_request -- depends_on: - - image-tag - image: plugins/docker:linux-arm - name: build-logcli-image - settings: - dockerfile: cmd/logcli/Dockerfile - dry_run: true - password: - from_secret: docker_password - repo: grafana/logcli - username: - from_secret: docker_username - when: - event: - - pull_request - depends_on: - image-tag image: plugins/docker:linux-arm @@ -622,8 +338,6 @@ trigger: - refs/tags/v* - refs/pull/*/head --- -depends_on: -- check kind: pipeline name: promtail-amd64 platform: @@ -636,21 +350,6 @@ steps: - echo $(./tools/image-tag)-amd64 > .tags image: alpine name: image-tag -- depends_on: - - image-tag - image: plugins/docker - name: build-promtail-image - settings: - dockerfile: clients/cmd/promtail/Dockerfile - dry_run: true - password: - from_secret: docker_password - repo: grafana/promtail - username: - from_secret: docker_username - when: - event: - - pull_request - depends_on: - image-tag image: plugins/docker @@ -674,8 +373,6 @@ trigger: - refs/tags/v* - refs/pull/*/head --- -depends_on: -- check kind: pipeline name: promtail-arm64 platform: @@ -688,21 +385,6 @@ steps: - echo $(./tools/image-tag)-arm64 > .tags image: alpine name: image-tag -- depends_on: - - image-tag - image: plugins/docker - name: build-promtail-image - settings: - dockerfile: clients/cmd/promtail/Dockerfile - dry_run: true - password: - from_secret: docker_password - repo: grafana/promtail - username: - from_secret: docker_username - when: - event: - - pull_request - depends_on: - image-tag image: plugins/docker @@ -726,8 +408,6 @@ trigger: - refs/tags/v* - refs/pull/*/head --- -depends_on: -- check kind: pipeline name: promtail-arm platform: @@ -740,21 +420,6 @@ steps: - echo $(./tools/image-tag)-arm > .tags image: alpine name: image-tag -- depends_on: - - image-tag - image: plugins/docker:linux-arm - name: build-promtail-image - settings: - dockerfile: clients/cmd/promtail/Dockerfile.arm32 - dry_run: true - password: - from_secret: docker_password - repo: grafana/promtail - username: - from_secret: docker_username - when: - event: - - pull_request - depends_on: - image-tag image: plugins/docker:linux-arm @@ -778,8 +443,6 @@ trigger: - refs/tags/v* - refs/pull/*/head --- -depends_on: -- check kind: pipeline name: lokioperator-amd64 platform: @@ -792,22 +455,6 @@ steps: - echo $(./tools/image-tag)-amd64 > .tags image: alpine name: image-tag -- depends_on: - - image-tag - image: plugins/docker - name: build-loki-operator-image - settings: - context: operator - dockerfile: operator/Dockerfile - dry_run: true - password: - from_secret: docker_password - repo: grafana/loki-operator - username: - from_secret: docker_username - when: - event: - - pull_request - depends_on: - image-tag image: plugins/docker @@ -832,8 +479,6 @@ trigger: - refs/tags/v* - refs/pull/*/head --- -depends_on: -- check kind: pipeline name: lokioperator-arm64 platform: @@ -846,22 +491,6 @@ steps: - echo $(./tools/image-tag)-arm64 > .tags image: alpine name: image-tag -- depends_on: - - image-tag - image: plugins/docker - name: build-loki-operator-image - settings: - context: operator - dockerfile: operator/Dockerfile - dry_run: true - password: - from_secret: docker_password - repo: grafana/loki-operator - username: - from_secret: docker_username - when: - event: - - pull_request - depends_on: - image-tag image: plugins/docker @@ -886,8 +515,6 @@ trigger: - refs/tags/v* - refs/pull/*/head --- -depends_on: -- check kind: pipeline name: lokioperator-arm platform: @@ -900,22 +527,6 @@ steps: - echo $(./tools/image-tag)-arm > .tags image: alpine name: image-tag -- depends_on: - - image-tag - image: plugins/docker:linux-arm - name: build-loki-operator-image - settings: - context: operator - dockerfile: operator/Dockerfile - dry_run: true - password: - from_secret: docker_password - repo: grafana/loki-operator - username: - from_secret: docker_username - when: - event: - - pull_request - depends_on: - image-tag image: plugins/docker:linux-arm @@ -940,8 +551,6 @@ trigger: - refs/tags/v* - refs/pull/*/head --- -depends_on: -- check kind: pipeline name: fluent-bit-amd64 platform: @@ -955,21 +564,6 @@ steps: - echo ",main" >> .tags image: alpine name: image-tag -- depends_on: - - image-tag - image: plugins/docker - name: build-fluent-bit-image - settings: - dockerfile: clients/cmd/fluent-bit/Dockerfile - dry_run: true - password: - from_secret: docker_password - repo: grafana/fluent-bit-plugin-loki - username: - from_secret: docker_username - when: - event: - - pull_request - depends_on: - image-tag image: plugins/docker @@ -993,8 +587,6 @@ trigger: - refs/tags/v* - refs/pull/*/head --- -depends_on: -- check kind: pipeline name: fluentd-amd64 platform: @@ -1008,21 +600,6 @@ steps: - echo ",main" >> .tags image: alpine name: image-tag -- depends_on: - - image-tag - image: plugins/docker - name: build-fluentd-image - settings: - dockerfile: clients/cmd/fluentd/Dockerfile - dry_run: true - password: - from_secret: docker_password - repo: grafana/fluent-plugin-loki - username: - from_secret: docker_username - when: - event: - - pull_request - depends_on: - image-tag image: plugins/docker @@ -1046,8 +623,6 @@ trigger: - refs/tags/v* - refs/pull/*/head --- -depends_on: -- check kind: pipeline name: logstash-amd64 platform: @@ -1061,21 +636,6 @@ steps: - echo ",main" >> .tags image: alpine name: image-tag -- depends_on: - - image-tag - image: plugins/docker - name: build-logstash-image - settings: - dockerfile: clients/cmd/logstash/Dockerfile - dry_run: true - password: - from_secret: docker_password - repo: grafana/logstash-output-loki - username: - from_secret: docker_username - when: - event: - - pull_request - depends_on: - image-tag image: plugins/docker @@ -1099,8 +659,6 @@ trigger: - refs/tags/v* - refs/pull/*/head --- -depends_on: -- check kind: pipeline name: querytee-amd64 platform: @@ -1114,21 +672,6 @@ steps: - echo ",main" >> .tags image: alpine name: image-tag -- depends_on: - - image-tag - image: plugins/docker - name: build-querytee-image - settings: - dockerfile: cmd/querytee/Dockerfile - dry_run: true - password: - from_secret: docker_password - repo: grafana/loki-query-tee - username: - from_secret: docker_username - when: - event: - - pull_request - depends_on: - image-tag image: plugins/docker @@ -1338,8 +881,6 @@ trigger: - refs/tags/v* - refs/pull/*/head --- -depends_on: -- check kind: pipeline name: logql-analyzer platform: @@ -1352,21 +893,6 @@ steps: - echo $(./tools/image-tag)-amd64 > .tags image: alpine name: image-tag -- depends_on: - - image-tag - image: plugins/docker - name: build-logql-analyzer-image - settings: - dockerfile: cmd/logql-analyzer/Dockerfile - dry_run: true - password: - from_secret: docker_password - repo: grafana/logql-analyzer - username: - from_secret: docker_username - when: - event: - - pull_request - depends_on: - image-tag image: plugins/docker @@ -1390,103 +916,6 @@ trigger: - refs/tags/v* - refs/pull/*/head --- -depends_on: -- check -image_pull_secrets: -- dockerconfigjson -kind: pipeline -name: release -services: -- image: jrei/systemd-debian:12 - name: systemd-debian - privileged: true - volumes: - - name: cgroup - path: /sys/fs/cgroup -- image: jrei/systemd-centos:8 - name: systemd-centos - privileged: true - volumes: - - name: cgroup - path: /sys/fs/cgroup -steps: -- commands: - - if [ "$${#TEST_SECRET}" -eq 0 ]; then - - ' echo "Missing a secret to run this pipeline. This branch needs to be re-pushed - as a branch in main grafana/loki repository in order to run." && exit 78' - - fi - environment: - TEST_SECRET: - from_secret: gpg_private_key - image: alpine - name: skip pipeline if missing secret -- commands: - - apk add --no-cache bash git - - git fetch origin --tags - image: alpine - name: fetch-tags -- commands: - - printf "%s" "$NFPM_SIGNING_KEY" > $NFPM_SIGNING_KEY_FILE - environment: - NFPM_SIGNING_KEY: - from_secret: gpg_private_key - NFPM_SIGNING_KEY_FILE: /drone/src/private-key.key - image: grafana/loki-build-image:0.29.3-go1.20.10 - name: write-key -- commands: - - make BUILD_IN_CONTAINER=false packages - environment: - NFPM_PASSPHRASE: - from_secret: gpg_passphrase - NFPM_SIGNING_KEY_FILE: /drone/src/private-key.key - image: grafana/loki-build-image:0.29.3-go1.20.10 - name: test packaging -- commands: - - ./tools/packaging/verify-deb-install.sh - image: docker - name: test deb package - privileged: true - volumes: - - name: docker - path: /var/run/docker.sock -- commands: - - ./tools/packaging/verify-rpm-install.sh - image: docker - name: test rpm package - privileged: true - volumes: - - name: docker - path: /var/run/docker.sock -- commands: - - make BUILD_IN_CONTAINER=false publish - environment: - GITHUB_TOKEN: - from_secret: github_token - NFPM_PASSPHRASE: - from_secret: gpg_passphrase - NFPM_SIGNING_KEY_FILE: /drone/src/private-key.key - image: grafana/loki-build-image:0.29.3-go1.20.10 - name: publish - when: - event: - - tag -trigger: - event: - - pull_request - - tag - ref: - - refs/heads/main - - refs/heads/k??? - - refs/tags/v* - - refs/pull/*/head -volumes: -- host: - path: /sys/fs/cgroup - name: cgroup -- host: - path: /var/run/docker.sock - name: docker ---- kind: pipeline name: docker-driver steps: @@ -1520,8 +949,6 @@ volumes: path: /var/run/docker.sock name: docker --- -depends_on: -- check kind: pipeline name: lambda-promtail-amd64 platform: @@ -1544,25 +971,6 @@ steps: from_secret: ecr_key image: alpine name: skip pipeline if missing secret -- depends_on: - - image-tag - - skip pipeline if missing secret - image: cstyan/ecr - name: build-lambda-promtail-image - privileged: true - settings: - access_key: - from_secret: ecr_key - dockerfile: tools/lambda-promtail/Dockerfile - dry_run: true - region: us-east-1 - registry: public.ecr.aws/grafana - repo: public.ecr.aws/grafana/lambda-promtail - secret_key: - from_secret: ecr_secret_key - when: - event: - - pull_request - depends_on: - image-tag image: cstyan/ecr @@ -1589,8 +997,6 @@ trigger: - refs/tags/v* - refs/pull/*/head --- -depends_on: -- check kind: pipeline name: lambda-promtail-arm64 platform: @@ -1613,25 +1019,6 @@ steps: from_secret: ecr_key image: alpine name: skip pipeline if missing secret -- depends_on: - - image-tag - - skip pipeline if missing secret - image: cstyan/ecr - name: build-lambda-promtail-image - privileged: true - settings: - access_key: - from_secret: ecr_key - dockerfile: tools/lambda-promtail/Dockerfile - dry_run: true - region: us-east-1 - registry: public.ecr.aws/grafana - repo: public.ecr.aws/grafana/lambda-promtail - secret_key: - from_secret: ecr_secret_key - when: - event: - - pull_request - depends_on: - image-tag image: cstyan/ecr @@ -1765,6 +1152,6 @@ kind: secret name: gpg_private_key --- kind: signature -hmac: ad5a4e4a80718da3bdb6725694ef96c7c274c1cd1eb70bd630bf9491f85fff8d +hmac: adb7abe29244c9e5d6e6e7cc61ad5d800fcbd14a2be6c5c52d4d697e09bf6131 ... diff --git a/.github/jsonnetfile.lock.json b/.github/jsonnetfile.lock.json index a423bbb0bad22..790658ca79b75 100644 --- a/.github/jsonnetfile.lock.json +++ b/.github/jsonnetfile.lock.json @@ -8,8 +8,8 @@ "subdir": "workflows" } }, - "version": "1d6247891e2b9d68d38403d7a6c63b9285ff640f", - "sum": "aQpCoAM3E9srNOL9f0tsdB/qlKCEEfUjj38u1deUD1w=" + "version": "6b01459ac1e5e853427055f0d876b852e3d37013", + "sum": "9e1I49GbVE58H61ckjKROn4H8PVUMZjTGQPvEr2pado=" } ], "legacyImports": false diff --git a/.github/vendor/github.com/grafana/loki-release/workflows/build.libsonnet b/.github/vendor/github.com/grafana/loki-release/workflows/build.libsonnet index cdd6b82463e4b..fe165048b8cd9 100644 --- a/.github/vendor/github.com/grafana/loki-release/workflows/build.libsonnet +++ b/.github/vendor/github.com/grafana/loki-release/workflows/build.libsonnet @@ -79,7 +79,9 @@ local releaseLibStep = common.releaseLibStep; --repo-url="${{ env.RELEASE_REPO }}" \ --target-branch "${{ steps.extract_branch.outputs.branch }}" \ --token="${{ secrets.GH_TOKEN }}" \ - --versioning-strategy "${{ env.VERSIONING_STRATEGY }}" + --versioning-strategy "${{ env.VERSIONING_STRATEGY }}" \ + --manifest-file .release-please-manifest.json \ + --debug if [[ `jq length release.json` -gt 1 ]]; then echo 'release-please would create more than 1 PR, so cannot determine correct version' diff --git a/.github/vendor/github.com/grafana/loki-release/workflows/common.libsonnet b/.github/vendor/github.com/grafana/loki-release/workflows/common.libsonnet index e3346f2bd5e4e..29e03503717ce 100644 --- a/.github/vendor/github.com/grafana/loki-release/workflows/common.libsonnet +++ b/.github/vendor/github.com/grafana/loki-release/workflows/common.libsonnet @@ -86,6 +86,7 @@ + $.step.with({ repository: 'grafana/loki-release', path: 'lib', + ref: 'release-1.11.x', }), setupNode: $.step.new('setup node', 'actions/setup-node@v4') diff --git a/.github/vendor/github.com/grafana/loki-release/workflows/release.libsonnet b/.github/vendor/github.com/grafana/loki-release/workflows/release.libsonnet index 6bf2daa8f0334..b42a3fc6a0624 100644 --- a/.github/vendor/github.com/grafana/loki-release/workflows/release.libsonnet +++ b/.github/vendor/github.com/grafana/loki-release/workflows/release.libsonnet @@ -30,7 +30,6 @@ local pullRequestFooter = 'Merging this PR will release the [artifacts](https:// //TODO backport action should not bring over autorelease: pending label + step.withRun(||| npm install - echo "Pull request footer: %s" npm exec -- release-please release-pr \ --consider-all-branches \ --label "backport main,autorelease: pending,type/docs" \ @@ -41,8 +40,9 @@ local pullRequestFooter = 'Merging this PR will release the [artifacts](https:// --token "${{ secrets.GH_TOKEN }}" \ --versioning-strategy "${{ env.VERSIONING_STRATEGY }}" \ --separate-pull-requests false \ + --manifest-file .release-please-manifest.json \ --debug - ||| % [pullRequestFooter, pullRequestFooter]), + ||| % pullRequestFooter), ]), shouldRelease: job.new() diff --git a/.github/workflows/minor-release-pr.yml b/.github/workflows/minor-release-pr.yml index 2704fa974ddd4..78ad1a56936df 100644 --- a/.github/workflows/minor-release-pr.yml +++ b/.github/workflows/minor-release-pr.yml @@ -36,6 +36,7 @@ jobs: uses: "actions/checkout@v4" with: path: "lib" + ref: "release-1.11.x" repository: "grafana/loki-release" - name: "setup node" uses: "actions/setup-node@v4" @@ -52,7 +53,6 @@ jobs: name: "release please" run: | npm install - echo "Pull request footer: Merging this PR will release the [artifacts](https://console.cloud.google.com/storage/browser/loki-build-artifacts/${SHA}) of ${SHA}" npm exec -- release-please release-pr \ --consider-all-branches \ --label "backport main,autorelease: pending,type/docs" \ @@ -63,6 +63,7 @@ jobs: --token "${{ secrets.GH_TOKEN }}" \ --versioning-strategy "${{ env.VERSIONING_STRATEGY }}" \ --separate-pull-requests false \ + --manifest-file .release-please-manifest.json \ --debug working-directory: "lib" dist: @@ -126,6 +127,7 @@ jobs: uses: "actions/checkout@v4" with: path: "lib" + ref: "release-1.11.x" repository: "grafana/loki-release" - name: "pull code to release" uses: "actions/checkout@v4" @@ -184,6 +186,7 @@ jobs: uses: "actions/checkout@v4" with: path: "lib" + ref: "release-1.11.x" repository: "grafana/loki-release" - name: "pull code to release" uses: "actions/checkout@v4" @@ -242,6 +245,7 @@ jobs: uses: "actions/checkout@v4" with: path: "lib" + ref: "release-1.11.x" repository: "grafana/loki-release" - name: "pull code to release" uses: "actions/checkout@v4" @@ -302,6 +306,7 @@ jobs: uses: "actions/checkout@v4" with: path: "lib" + ref: "release-1.11.x" repository: "grafana/loki-release" - name: "pull code to release" uses: "actions/checkout@v4" @@ -360,6 +365,7 @@ jobs: uses: "actions/checkout@v4" with: path: "lib" + ref: "release-1.11.x" repository: "grafana/loki-release" - name: "pull code to release" uses: "actions/checkout@v4" @@ -420,6 +426,7 @@ jobs: uses: "actions/checkout@v4" with: path: "lib" + ref: "release-1.11.x" repository: "grafana/loki-release" - name: "pull code to release" uses: "actions/checkout@v4" @@ -480,6 +487,7 @@ jobs: uses: "actions/checkout@v4" with: path: "lib" + ref: "release-1.11.x" repository: "grafana/loki-release" - name: "pull code to release" uses: "actions/checkout@v4" @@ -538,6 +546,7 @@ jobs: uses: "actions/checkout@v4" with: path: "lib" + ref: "release-1.11.x" repository: "grafana/loki-release" - name: "pull code to release" uses: "actions/checkout@v4" @@ -598,6 +607,7 @@ jobs: uses: "actions/checkout@v4" with: path: "lib" + ref: "release-1.11.x" repository: "grafana/loki-release" - name: "pull code to release" uses: "actions/checkout@v4" @@ -659,6 +669,7 @@ jobs: uses: "actions/checkout@v4" with: path: "lib" + ref: "release-1.11.x" repository: "grafana/loki-release" - name: "pull code to release" uses: "actions/checkout@v4" @@ -686,7 +697,9 @@ jobs: --repo-url="${{ env.RELEASE_REPO }}" \ --target-branch "${{ steps.extract_branch.outputs.branch }}" \ --token="${{ secrets.GH_TOKEN }}" \ - --versioning-strategy "${{ env.VERSIONING_STRATEGY }}" + --versioning-strategy "${{ env.VERSIONING_STRATEGY }}" \ + --manifest-file .release-please-manifest.json \ + --debug if [[ `jq length release.json` -gt 1 ]]; then echo 'release-please would create more than 1 PR, so cannot determine correct version' diff --git a/.github/workflows/patch-release-pr.yml b/.github/workflows/patch-release-pr.yml index db2e5995e4dab..ffbf8c344e6a0 100644 --- a/.github/workflows/patch-release-pr.yml +++ b/.github/workflows/patch-release-pr.yml @@ -36,6 +36,7 @@ jobs: uses: "actions/checkout@v4" with: path: "lib" + ref: "release-1.11.x" repository: "grafana/loki-release" - name: "setup node" uses: "actions/setup-node@v4" @@ -52,7 +53,6 @@ jobs: name: "release please" run: | npm install - echo "Pull request footer: Merging this PR will release the [artifacts](https://console.cloud.google.com/storage/browser/loki-build-artifacts/${SHA}) of ${SHA}" npm exec -- release-please release-pr \ --consider-all-branches \ --label "backport main,autorelease: pending,type/docs" \ @@ -63,6 +63,7 @@ jobs: --token "${{ secrets.GH_TOKEN }}" \ --versioning-strategy "${{ env.VERSIONING_STRATEGY }}" \ --separate-pull-requests false \ + --manifest-file .release-please-manifest.json \ --debug working-directory: "lib" dist: @@ -126,6 +127,7 @@ jobs: uses: "actions/checkout@v4" with: path: "lib" + ref: "release-1.11.x" repository: "grafana/loki-release" - name: "pull code to release" uses: "actions/checkout@v4" @@ -184,6 +186,7 @@ jobs: uses: "actions/checkout@v4" with: path: "lib" + ref: "release-1.11.x" repository: "grafana/loki-release" - name: "pull code to release" uses: "actions/checkout@v4" @@ -242,6 +245,7 @@ jobs: uses: "actions/checkout@v4" with: path: "lib" + ref: "release-1.11.x" repository: "grafana/loki-release" - name: "pull code to release" uses: "actions/checkout@v4" @@ -302,6 +306,7 @@ jobs: uses: "actions/checkout@v4" with: path: "lib" + ref: "release-1.11.x" repository: "grafana/loki-release" - name: "pull code to release" uses: "actions/checkout@v4" @@ -360,6 +365,7 @@ jobs: uses: "actions/checkout@v4" with: path: "lib" + ref: "release-1.11.x" repository: "grafana/loki-release" - name: "pull code to release" uses: "actions/checkout@v4" @@ -420,6 +426,7 @@ jobs: uses: "actions/checkout@v4" with: path: "lib" + ref: "release-1.11.x" repository: "grafana/loki-release" - name: "pull code to release" uses: "actions/checkout@v4" @@ -480,6 +487,7 @@ jobs: uses: "actions/checkout@v4" with: path: "lib" + ref: "release-1.11.x" repository: "grafana/loki-release" - name: "pull code to release" uses: "actions/checkout@v4" @@ -538,6 +546,7 @@ jobs: uses: "actions/checkout@v4" with: path: "lib" + ref: "release-1.11.x" repository: "grafana/loki-release" - name: "pull code to release" uses: "actions/checkout@v4" @@ -598,6 +607,7 @@ jobs: uses: "actions/checkout@v4" with: path: "lib" + ref: "release-1.11.x" repository: "grafana/loki-release" - name: "pull code to release" uses: "actions/checkout@v4" @@ -659,6 +669,7 @@ jobs: uses: "actions/checkout@v4" with: path: "lib" + ref: "release-1.11.x" repository: "grafana/loki-release" - name: "pull code to release" uses: "actions/checkout@v4" @@ -686,7 +697,9 @@ jobs: --repo-url="${{ env.RELEASE_REPO }}" \ --target-branch "${{ steps.extract_branch.outputs.branch }}" \ --token="${{ secrets.GH_TOKEN }}" \ - --versioning-strategy "${{ env.VERSIONING_STRATEGY }}" + --versioning-strategy "${{ env.VERSIONING_STRATEGY }}" \ + --manifest-file .release-please-manifest.json \ + --debug if [[ `jq length release.json` -gt 1 ]]; then echo 'release-please would create more than 1 PR, so cannot determine correct version' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 64970d1bd7192..578f14f195933 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -21,6 +21,7 @@ jobs: uses: "actions/checkout@v4" with: path: "lib" + ref: "release-1.11.x" repository: "grafana/loki-release" - name: "setup node" uses: "actions/setup-node@v4" @@ -67,6 +68,7 @@ jobs: uses: "actions/checkout@v4" with: path: "lib" + ref: "release-1.11.x" repository: "grafana/loki-release" - name: "auth gcs" uses: "google-github-actions/auth@v2" @@ -108,6 +110,7 @@ jobs: uses: "actions/checkout@v4" with: path: "lib" + ref: "release-1.11.x" repository: "grafana/loki-release" - id: "extract_branch" name: "extract branch name"