From 985b45f73ec2456418d21338b635aba0184eeab8 Mon Sep 17 00:00:00 2001 From: Gromit Date: Wed, 17 Jan 2024 08:27:47 +0000 Subject: [PATCH] Auto generated from templates by gromit --- .github/workflows/release.yml | 216 ++++++++++++---------------------- ci/Dockerfile.std | 7 +- ci/aws/byol.pkr.hcl | 101 ---------------- ci/goreleaser/goreleaser.yml | 22 ++-- ci/install/before_install.sh | 2 +- ci/install/post_install.sh | 2 +- ci/install/post_remove.sh | 2 +- ci/install/post_trans.sh | 2 +- 8 files changed, 98 insertions(+), 256 deletions(-) delete mode 100644 ci/aws/byol.pkr.hcl diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ab00f9c6d..c5988013d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,5 +1,5 @@ # Generated by: gromit policy -# Generated on: Wed Nov 29 23:09:25 UTC 2023 +# Generated on: Wed Jan 17 08:27:47 UTC 2024 # Distribution channels covered by this workflow # - Ubuntu and Debian @@ -9,11 +9,10 @@ # - Cloudsmith name: Release - on: # Trigger release every monday at midnight for master CI images schedule: - - cron: "0 0 * * 1" + - cron: "0 0 * * 1" pull_request: push: branches: @@ -21,51 +20,35 @@ on: - release-** tags: - 'v*' - env: GOPRIVATE: github.com/TykTechnologies - jobs: goreleaser: name: '${{ matrix.golang_cross }}' runs-on: ubuntu-latest - container: 'tykio/golang-cross:${{ matrix.golang_cross }}' permissions: - id-token: write # AWS OIDC JWT - contents: read # actions/checkout + id-token: write # AWS OIDC JWT + contents: read # actions/checkout strategy: fail-fast: false matrix: golang_cross: - - 1.19-bullseye - include: + - 1.19-bullseye + include: - golang_cross: 1.19-bullseye goreleaser: 'ci/goreleaser/goreleaser.yml' - cgo: 0 + cgo: 0 rpmvers: 'el/7 el/8 el/9 amazon/2 amazon/2023' - debvers: 'ubuntu/xenial ubuntu/bionic ubuntu/focal ubuntu/jammy debian/jessie debian/buster debian/bullseye debian/bookworm' + debvers: 'ubuntu/xenial ubuntu/bionic ubuntu/focal ubuntu/jammy debian/jessie debian/buster debian/bullseye debian/bookworm' outputs: tags: ${{ steps.metadata.outputs.tags }} - steps: - - name: Fix private module deps - env: - TOKEN: '${{ secrets.ORG_GH_TOKEN }}' - run: > - git config --global url."https://${TOKEN}@github.com".insteadOf "https://github.com" - - name: Checkout of tyk-pump uses: actions/checkout@v4 with: fetch-depth: 1 - - - name: "Add Git safe.directory" - run: git config --global --add safe.directory $GITHUB_WORKSPACE - - uses: docker/setup-qemu-action@v3 - - uses: docker/setup-buildx-action@v3 - - name: Login to DockerHub if: startsWith(github.ref, 'refs/tags') uses: docker/login-action@v3 @@ -79,17 +62,6 @@ jobs: registry: docker.tyk.io username: ${{ secrets.CLOUDSMITH_USERNAME }} password: ${{ secrets.CLOUDSMITH_API_KEY }} - - - name: Unlock agent - env: - NFPM_STD_PASSPHRASE: ${{ secrets.SIGNING_KEY_PASSPHRASE }} - GPG_FINGERPRINT: 12B5D62C28F57592D1575BD51ED14C59E37DAC20 - PKG_SIGNING_KEY: ${{ secrets.SIGNING_KEY }} - run: - ci/bin/unlock-agent.sh - - - - uses: actions/cache@v3 with: path: | @@ -98,22 +70,36 @@ jobs: key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }} restore-keys: | ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }} - - - uses: goreleaser/goreleaser-action@v5 - with: - version: latest - args: release --clean -f ${{ matrix.goreleaser }} ${{ !startsWith(github.ref, 'refs/tags/') && ' --snapshot' || '' }} + - name: Build env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - CGO_ENABLED: ${{ matrix.cgo }} NFPM_STD_PASSPHRASE: ${{ secrets.SIGNING_KEY_PASSPHRASE }} - NFPM_PAYG_PASSPHRASE: ${{ secrets.SIGNING_KEY_PASSPHRASE }} - GPG_FINGERPRINT: 12B5D62C28F57592D1575BD51ED14C59E37DAC20 PKG_SIGNING_KEY: ${{ secrets.SIGNING_KEY }} - GOLANG_CROSS: ${{ matrix.golang_cross }} - DEBVERS: ${{ matrix.debvers }} - RPMVERS: ${{ matrix.rpmvers }} PACKAGECLOUD_TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }} + run: | + echo '#!/bin/sh + ci/bin/unlock-agent.sh + git config --global url."https://${TOKEN}@github.com".insteadOf "https://github.com" + git config --global --add safe.directory /go/src/github.com/TykTechnologies/tyk-pump + goreleaser release --clean -f ${{ matrix.goreleaser }} ${{ !startsWith(github.ref, 'refs/tags/') && ' --snapshot' || '' }}' | tee /tmp/build.sh + chmod +x /tmp/build.sh + docker run --rm --privileged -e GITHUB_TOKEN=${{ github.token }} \ + -e GOPRIVATE=github.com/TykTechnologies \ + -e GO111MODULE=on \ + -e DEBVERS='${{ matrix.debvers }}' \ + -e RPMVERS='${{ matrix.rpmvers }}' \ + -e CGO_ENABLED=${{ matrix.cgo }} \ + -e NFPM_STD_PASSPHRASE="$NFPM_STD_PASSPHRASE" \ + -e GPG_FINGERPRINT=12B5D62C28F57592D1575BD51ED14C59E37DAC20 \ + -e PKG_SIGNING_KEY="$PKG_SIGNING_KEY" \ + -e PACKAGECLOUD_TOKEN=$PACKAGECLOUD_TOKEN \ + -v ${{github.workspace}}:/go/src/github.com/TykTechnologies/tyk-pump \ + -v /var/run/docker.sock:/var/run/docker.sock \ + -v ~/.docker/config.json:/root/.docker/config.json \ + -v ~/go/pkg/mod:/go/pkg/mod \ + -v /tmp/build.sh:/tmp/build.sh \ + -w /go/src/github.com/TykTechnologies/tyk-pump \ + tykio/golang-cross:${{ matrix.golang_cross }} /tmp/build.sh - uses: aws-actions/configure-aws-credentials@v4 with: role-to-assume: arn:aws:iam::754489498669:role/ecr_rw_tyk @@ -121,13 +107,11 @@ jobs: aws-region: eu-central-1 # Don't mask to pass it across job boundaries mask-aws-account-id: false - - uses: aws-actions/amazon-ecr-login@v2 id: ecr if: ${{ matrix.golang_cross == '1.19-bullseye' }} with: mask-password: 'true' - - name: Docker metadata for CI id: metadata if: ${{ matrix.golang_cross == '1.19-bullseye' }} @@ -142,7 +126,6 @@ jobs: type=sha,format=long type=semver,pattern=v{{major}}.{{minor}},prefix=v type=semver,pattern=v{{version}},prefix=v - - name: CI push if: ${{ matrix.golang_cross == '1.19-bullseye' }} shell: bash @@ -158,7 +141,6 @@ jobs: done docker manifest create ${tag} ${tag}-amd64 ${tag}-arm64 && docker manifest push ${tag} done - - uses: actions/upload-artifact@v3 if: ${{ matrix.golang_cross == '1.19-bullseye' }} with: @@ -167,7 +149,6 @@ jobs: path: | dist/*.deb !dist/*PAYG*.deb - - uses: actions/upload-artifact@v3 if: ${{ matrix.golang_cross == '1.19-bullseye' }} with: @@ -176,17 +157,40 @@ jobs: path: | dist/*.rpm !dist/*PAYG*.rpm - api-tests: + test-controller: needs: goreleaser runs-on: ubuntu-latest + container: tykio/gromit:v1.6 + outputs: + conf: ${{ steps.params.outputs.conf }} + db: ${{ steps.params.outputs.db }} + pump: ${{ steps.params.outputs.pump }} + sink: ${{ steps.params.outputs.sink }} + gd_tag: ${{ steps.params.outputs.gd_tag }} + versions: ${{ steps.params.outputs.versions }} + steps: + - name: set params + id: params + env: + REPO: ${{ github.repository }} + # Cover pull_request_target too + BASE_REF: ${{startsWith(github.event_name, 'pull_request') && github.base_ref || github.ref}} + TAGS: ${{ needs.goreleaser.outputs.tags }} + IS_PR: ${{startsWith(github.event_name, 'pull_request') && 'yes' }} + IS_TAG: ${{startsWith(github.ref, 'refs/tags') && 'yes' }} + run: gromit policy controller --loglevel debug | tee -a "$GITHUB_OUTPUT" + api-tests: + needs: test-controller + runs-on: ubuntu-latest permissions: - id-token: write # This is required for requesting the JWT - contents: read # This is required for actions/checkout + id-token: write # This is required for requesting the Github JWT + contents: read # This is required for actions/checkout strategy: fail-fast: false matrix: - conf: [ "sha256", "murmur64" ] - db: [ "mongo44", "postgres15" ] + conf: ${{ fromJson(needs.test-controller.outputs.conf) }} + db: ${{ fromJson(needs.test-controller.outputs.db) }} + sink: ${{ fromJson(needs.test-controller.outputs.sink) }} include: - db: postgres15 markers: "and not sql" @@ -196,104 +200,68 @@ jobs: role-to-assume: arn:aws:iam::754489498669:role/ecr_rw_tyk role-session-name: cipush aws-region: eu-central-1 - - id: ecr uses: aws-actions/amazon-ecr-login@v2 with: mask-password: 'true' mask-aws-account-id: 'true' - - # Only ${{ github.actor }} has access - # See https://github.com/mxschmitt/action-tmate#use-registered-public-ssh-keys - + # Only ${{ github.actor }} has access + # See https://github.com/mxschmitt/action-tmate#use-registered-public-ssh-keys - name: Setup tmate session only in debug mode uses: mxschmitt/action-tmate@v3 if: ${{ runner.debug == '1' }} with: detached: true limit-access-to-actor: true - - name: fetch env from tyk-ci env: GH_TOKEN: ${{ github.token }} run: | gh release download v1.2 --repo github.com/TykTechnologies/tyk-ci -O env.tgz tar xzvf env.tgz - - name: env up shell: bash working-directory: auto id: env_up env: - t: ${{ needs.goreleaser.outputs.tags }} pull_policy: 'if_not_present' - # default tag to use - default_image_tag: ${{ startsWith(github.ref_name, 'release-') && github.ref_name || 'master' }} GH_TOKEN: ${{ secrets.ORG_GH_TOKEN }} TYK_DB_LICENSEKEY: ${{ secrets.DASH_LICENSE }} TYK_MDCB_LICENSE: ${{ secrets.MDCB_LICENSE }} - run: | - echo CI tags: $t - tags=($t) - echo First tag: ${tags[0]} - # Start customising the env - echo "registry=${{ steps.ecr.outputs.registry }} - tyk_image=\${registry}/tyk:${default_image_tag} - tyk_analytics_image=\${registry}/tyk-analytics:${default_image_tag} - tyk_sink_image=\${registry}/tyk-sink:${default_image_tag} - tyk_pump_image=\${registry}/tyk-pump:${default_image_tag} - # override default above with just built tag - tyk_pump_image=${tags[0]} - # alfa and beta have to come after the override - tyk_alfa_image=\${tyk_image} - tyk_beta_image=\${tyk_image} - # base dir for config files - confs_dir=./pro-ha - # pick database to use - env_file=local-${{ matrix.db }}.env - " > versions.env - # Add Tyk component config variations to $env_file - cat confs/${{ matrix.conf }}.env >> local-${{ matrix.db }}.env - # bring up env, the project name is important - docker compose -p auto -f pro-ha.yml -f deps_pro-ha.yml -f ${{ matrix.db }}.yml --env-file versions.env --profile master-datacenter up --quiet-pull -d - ./dash-bootstrap.sh http://localhost:3000 - docker compose -p auto -f pro-ha.yml -f deps_pro-ha.yml -f ${{ matrix.db }}.yml --env-file versions.env --profile slave-datacenter up --quiet-pull -d - + ECR: ${{ steps.ecr.outputs.registry }} + VERSIONS: ${{ needs.test-controller.outputs.versions}} + run: "echo \"ECR=${ECR}\n$VERSIONS\n\ntyk_sink_image=${{matrix.sink}} \n# base dir for config files\nconfs_dir=./pro-ha\n# pick database to use\nenv_file=local-${{ matrix.db }}.env\n\" > versions.env\nprintf '::group::versions\\n%s\\n::endgroup::' \"$(cat versions.env)\"\n# Add Tyk component config variations to $env_file\ncat confs/${{ matrix.conf }}.env >> local-${{ matrix.db }}.env\n# bring up env, the project name is important\ndocker compose -p auto -f pro-ha.yml -f deps_pro-ha.yml -f ${{ matrix.db }}.yml --env-file versions.env --profile master-datacenter up --quiet-pull -d\n./dash-bootstrap.sh http://localhost:3000\ndocker compose -p auto -f pro-ha.yml -f deps_pro-ha.yml -f ${{ matrix.db }}.yml --env-file versions.env --profile slave-datacenter up --quiet-pull -d\n" - name: Run tests working-directory: auto id: test_execution run: | - echo "## API tests ${{ matrix.db }} ${{ matrix.conf }}" >> $GITHUB_STEP_SUMMARY + echo "### API tests ${{ matrix.db }} ${{ matrix.conf }}" >> $GITHUB_STEP_SUMMARY if docker run --rm --network auto_default --env-file pytest.env -v ${{ github.workspace }}/reports:/app/reports \ - ${{ steps.ecr.outputs.registry }}/tyk-automated-tests:${{ startsWith(github.ref_name, 'release-') && github.ref_name || 'master' }} \ - pytest -c pytest_ci.ini --ci -m "not local and not dind ${{ matrix.markers }}" > tests.out; then + ${{ steps.ecr.outputs.registry }}/tyk-automated-tests:${{ needs.test-controller.outputs.gd_tag }} \ + pytest -c pytest_ci.ini --ci -m "not local and not dind ${{ matrix.markers }}" | tee tests.out; then echo "All tests passed!" >> $GITHUB_STEP_SUMMARY else echo "::error title=API tests ${{ matrix.db }} ${{ matrix.conf }}::Test execution failed" cat tests.out >> $GITHUB_STEP_SUMMARY - docker compose -p auto -f pro-ha.yml -f deps_pro-ha.yml -f ${{ matrix.db }}.yml --env-file versions.env logs tyk tyk-analytics + docker logs tyk tyk-analytics exit 1 fi - - name: Archive Integration tests report - if: ${{ always() }} + if: ${{ always() }} uses: actions/upload-artifact@v3 with: - name: api-test-report - retention-days: 3 - path: ${{ github.workspace }}/reports - + name: api-test-report + retention-days: 3 + path: ${{ github.workspace }}/reports - name: Fetch commit author - if: ${{ steps.test_execution.outcome != 'success' && !github.event.pull_request.draft }} + if: ${{ steps.test_execution.outcome != 'success' && !github.event.pull_request.draft }} run: echo "GIT_USER_EMAIL=$(git show -s --format='%ae' HEAD)" >> $GITHUB_ENV - - name: Fetch slack user - if: ${{ steps.test_execution.outcome != 'success' && !github.event.pull_request.draft }} + if: ${{ steps.test_execution.outcome != 'success' && !github.event.pull_request.draft }} id: fetch_slack_user uses: TykTechnologies/github-actions/.github/actions/github-to-slack@main with: github_email: ${{ env.GIT_USER_EMAIL }} - - name: Notify slack if: ${{ steps.test_execution.outcome != 'success' && !github.event.pull_request.draft }} uses: rtCamp/action-slack-notify@v2 @@ -304,23 +272,15 @@ jobs: SLACK_USERNAME: API INTEGRATION TESTS SLACK_MESSAGE: "*Test*: ${{ matrix.db }}-${{ matrix.conf }}, *Author*: ${{ steps.fetch_slack_user.outputs.slack-user-name }}" SLACK_FOOTER: "" - - name: Comment on PR if: ${{ always() && !github.event.pull_request.draft }} uses: mshick/add-pr-comment@v2 with: - message: | - **API tests result - ${{ matrix.db }}-${{ matrix.conf }} env: ${{ steps.test_execution.outcome }}** ${{ env.STATUS }} - Branch used: ${{ github.ref }} - Commit: ${{ github.event.after }} ${{ github.event.commits[0].message }} - Triggered by: ${{ github.event_name }} (@${{ github.actor }}) - [Execution page](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}) + message: "**API tests result - ${{ matrix.db }}-${{ matrix.conf }} env: ${{ steps.test_execution.outcome }}** ${{ env.STATUS }} \nBranch used: ${{ github.ref }}\nCommit: ${{ github.event.after }} ${{ github.event.commits[0].message }}\nTriggered by: ${{ github.event_name }} (@${{ github.actor }})\n[Execution page](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }})\n" repo-token: ${{ secrets.ORG_GH_TOKEN }} message-id: ${{ matrix.db }}-${{ matrix.conf }} env: STATUS: "${{ steps.test_execution.outcome == 'success' && ':white_check_mark:' || ':no_entry_sign:' }}" - - upgrade-deb: if: startsWith(github.ref, 'refs/tags') services: @@ -340,20 +300,15 @@ jobs: - ubuntu:jammy - debian:bullseye - debian:bookworm - steps: - uses: actions/checkout@v4 with: fetch-depth: 1 - - uses: actions/download-artifact@v3 with: name: deb - - uses: docker/setup-qemu-action@v3 - - uses: docker/setup-buildx-action@v3 - - name: generate dockerfile run: | echo 'FROM ${{ matrix.distro }} @@ -363,7 +318,6 @@ jobs: RUN curl -fsSL https://packagecloud.io/install/repositories/tyk/tyk-pump/script.deb.sh | bash && apt-get install -y tyk-pump=1.6.0 RUN dpkg -i tyk-pump.deb ' > Dockerfile - - name: install on ${{ matrix.distro }} uses: docker/build-push-action@v5 with: @@ -371,7 +325,6 @@ jobs: platforms: linux/${{ matrix.arch }} file: Dockerfile push: false - upgrade-rpm: if: startsWith(github.ref, 'refs/tags') services: @@ -386,18 +339,14 @@ jobs: - amazonlinux:2023 - registry.access.redhat.com/ubi8/ubi - registry.access.redhat.com/ubi9/ubi - steps: - uses: actions/checkout@v4 with: fetch-depth: 1 - - uses: actions/download-artifact@v3 with: name: rpm - - uses: docker/setup-buildx-action@v3 - - name: generate dockerfile run: | echo 'FROM ${{ matrix.distro }} @@ -408,23 +357,12 @@ jobs: RUN rpm --checksig tyk-pump.rpm RUN rpm -Uvh --force tyk-pump.rpm ' > Dockerfile - - name: install on ${{ matrix.distro }} uses: docker/build-push-action@v5 with: context: "." file: Dockerfile push: false - - release-tests: - needs: - - goreleaser - permissions: - id-token: write # This is required for requesting the JWT - contents: read # This is required for actions/checkout - uses: ./.github/workflows/release-tests.yml - - sbom: needs: goreleaser uses: TykTechnologies/github-actions/.github/workflows/sbom.yaml@main diff --git a/ci/Dockerfile.std b/ci/Dockerfile.std index 810cda963..fd75c2f18 100644 --- a/ci/Dockerfile.std +++ b/ci/Dockerfile.std @@ -1,5 +1,6 @@ # Generated by: gromit policy -# Generated on: Wed Nov 29 23:09:25 UTC 2023 +# Generated on: Wed Jan 17 08:27:47 UTC 2024 + FROM debian:bullseye-slim ARG TARGETARCH @@ -9,8 +10,8 @@ RUN apt-get update \ && apt-get dist-upgrade -y ca-certificates # Remove some things to decrease CVE surface -RUN dpkg --purge --force-remove-essential curl ncurses-base \ - && rm /usr/bin/passwd && rm /usr/sbin/adduser +RUN dpkg --purge --force-remove-essential curl ncurses-base || true +RUN rm -fv /usr/bin/passwd /usr/sbin/adduser || true # Clean up caches, unwanted .a and .o files RUN rm -rf /root/.cache \ diff --git a/ci/aws/byol.pkr.hcl b/ci/aws/byol.pkr.hcl deleted file mode 100644 index 71dc51a9f..000000000 --- a/ci/aws/byol.pkr.hcl +++ /dev/null @@ -1,101 +0,0 @@ - -# Generated by: gromit policy -# Generated on: Wed Nov 29 23:09:25 UTC 2023 - -packer { - required_plugins { - amazon = { - version = ">= 0.0.2" - source = "github.com/hashicorp/amazon" - } - } -} - -variable "flavour" { - description = "OS Flavour" - type = string -} - -variable "source_ami_owner" { - type = string -} - -variable "ami_search_string" { - type = string -} - -variable "region" { - type = string - default = "us-east-1" -} - -variable "version" { - type = string - default = "${env("VERSION")}" -} - -# Latest at this time -data "amazon-ami" "base-os" { - filters = { - architecture = "x86_64" - "block-device-mapping.volume-type" = "gp2" - name = "${var.ami_search_string}" - root-device-type = "ebs" - sriov-net-support = "simple" - virtualization-type = "hvm" - } - most_recent = true - owners = ["${var.source_ami_owner}"] -} - -# source blocks are generated from your builders; a source can be referenced in -# build blocks. A build block runs provisioner and post-processors on a -# source. Read the documentation for source blocks here: -# https://www.packer.io/docs/from-1.5/blocks/source -source "amazon-ebs" "byol" { - ami_name = "BYOL tyk-pump ${var.version} (${var.flavour})" - ena_support = true - force_delete_snapshot = true - force_deregister = true - instance_type = "t3.micro" - region = "${var.region}" - source_ami = data.amazon-ami.base-os.id - sriov_support = true - ssh_username = "ec2-user" - subnet_filter { - filters = { - "tag:Class" = "build" - } - most_free = true - random = false - } - tags = { - Component = "tyk-pump" - Flavour = "${var.flavour}" - Product = "byol" - Version = "${var.version}" - } -} - -# a build block invokes sources and runs provisioning steps on them. The -# documentation for build blocks can be found here: -# https://www.packer.io/docs/from-1.5/blocks/build -build { - sources = ["source.amazon-ebs.byol"] - provisioner "file" { - destination = "/tmp/semver.sh" - source = "utils/semver.sh" - } - provisioner "file" { - destination = "/tmp/tyk-pump.rpm" - sources = fileset(".", "rpm/*x86_64.rpm") - } - provisioner "file" { - destination = "/tmp/10-run-tyk.conf" - source = "utils/10-run-tyk.conf" - } - provisioner "shell" { - environment_vars = ["VERSION=${var.version}" ] - script = "byol/install-tyk-pump.sh" - } -} diff --git a/ci/goreleaser/goreleaser.yml b/ci/goreleaser/goreleaser.yml index a581a0595..2e7ef560c 100644 --- a/ci/goreleaser/goreleaser.yml +++ b/ci/goreleaser/goreleaser.yml @@ -1,5 +1,5 @@ # Generated by: gromit policy -# Generated on: Wed Nov 29 23:09:25 UTC 2023 +# Generated on: Wed Jan 17 08:27:47 UTC 2024 # Check the documentation at http://goreleaser.com # This project needs CGO_ENABLED=1 and the cross-compiler toolchains for @@ -19,7 +19,6 @@ builds: - arm64 - s390x binary: tyk-pump - dockers: # Build tykio/tyk-pump-docker-pub, docker.tyk.io/tyk-pump/tyk-pump (amd64) - ids: @@ -65,7 +64,6 @@ dockers: - "README.md" - "LICENSE.md" - "pump.example.conf" - docker_manifests: - name_template: tykio/tyk-pump-docker-pub:{{ .Tag }} image_templates: @@ -75,11 +73,22 @@ docker_manifests: image_templates: - tykio/tyk-pump-docker-pub:{{ .Tag }}-amd64 - tykio/tyk-pump-docker-pub:{{ .Tag }}-arm64 + - name_template: tykio/tyk-pump-docker-pub:v{{ .Major }}{{.Prerelease}} + image_templates: + - tykio/tyk-pump-docker-pub:{{ .Tag }}-amd64 + - tykio/tyk-pump-docker-pub:{{ .Tag }}-arm64 - name_template: docker.tyk.io/tyk-pump/tyk-pump:{{ .Tag }} image_templates: - docker.tyk.io/tyk-pump/tyk-pump:{{ .Tag }}-amd64 - docker.tyk.io/tyk-pump/tyk-pump:{{ .Tag }}-arm64 - + - name_template: docker.tyk.io/tyk-pump/tyk-pump:v{{ .Major }}.{{ .Minor }}{{.Prerelease}} + image_templates: + - docker.tyk.io/tyk-pump/tyk-pump:{{ .Tag }}-amd64 + - docker.tyk.io/tyk-pump/tyk-pump:{{ .Tag }}-arm64 + - name_template: tykio/tyk-pump-docker-pub:v{{ .Major }}{{.Prerelease}} + image_templates: + - docker.tyk.io/tyk-pump/tyk-pump:{{ .Tag }}-amd64 + - docker.tyk.io/tyk-pump/tyk-pump:{{ .Tag }}-arm64 nfpms: - id: std vendor: "Tyk Technologies Ltd" @@ -121,7 +130,6 @@ nfpms: signature: key_file: tyk.io.signing.key type: origin - publishers: - name: tyk-pump-unstable env: @@ -130,16 +138,12 @@ publishers: - RPMVERS={{ .Env.RPMVERS }} - DEBVERS={{ .Env.DEBVERS }} cmd: /pc.sh {{ .ArtifactPath }} - - # This disables archives archives: - format: binary allow_different_binary_count: true - checksum: disable: true - release: disable: true github: diff --git a/ci/install/before_install.sh b/ci/install/before_install.sh index 1d9d378f5..8bec290a6 100755 --- a/ci/install/before_install.sh +++ b/ci/install/before_install.sh @@ -1,7 +1,7 @@ #!/bin/bash # Generated by: gromit policy -# Generated on: Wed Nov 29 23:09:25 UTC 2023 +# Generated on: Wed Jan 17 08:27:47 UTC 2024 echo "Creating user and group..." GROUPNAME="tyk" diff --git a/ci/install/post_install.sh b/ci/install/post_install.sh index 4ff5aa316..0493ae4bf 100755 --- a/ci/install/post_install.sh +++ b/ci/install/post_install.sh @@ -2,7 +2,7 @@ # Generated by: gromit policy -# Generated on: Wed Nov 29 23:09:25 UTC 2023 +# Generated on: Wed Jan 17 08:27:47 UTC 2024 # If "True" the install directory ownership will be changed to "tyk:tyk" change_ownership="True" diff --git a/ci/install/post_remove.sh b/ci/install/post_remove.sh index 76f83c4fe..8cf3009cb 100755 --- a/ci/install/post_remove.sh +++ b/ci/install/post_remove.sh @@ -1,7 +1,7 @@ #!/bin/sh # Generated by: gromit policy -# Generated on: Wed Nov 29 23:09:25 UTC 2023 +# Generated on: Wed Jan 17 08:27:47 UTC 2024 cleanRemove() { diff --git a/ci/install/post_trans.sh b/ci/install/post_trans.sh index de77ca59c..64746e4b9 100644 --- a/ci/install/post_trans.sh +++ b/ci/install/post_trans.sh @@ -1,7 +1,7 @@ #!/bin/sh # Generated by: gromit policy -# Generated on: Wed Nov 29 23:09:25 UTC 2023 +# Generated on: Wed Jan 17 08:27:47 UTC 2024 if command -V systemctl >/dev/null 2>&1; then if [ ! -f /lib/systemd/system/tyk-pump.service ]; then