diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index e4d41529..7777f7a8 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -18,12 +18,12 @@ jobs: name: ${{ matrix.docker }} steps: - name: build - uses: sysdiglabs/exporter-builder@v0.5 + uses: sysdiglabs/exporter-builder@v1.1 with: exporter: redis-exporter - artifactory_token: ${{ secrets.ARTI_TOKEN }} - artifactory_username: david.lorite@sysdig.com + artifactory_token: ${{ secrets.GAR_DEV_RW_JSON_KEY }} + artifactory_username: _json_key sysdig_secure_token: ${{ secrets.SYSDIG_SECURE_TOKEN }} tag_name: dev target: ${{ matrix.docker }} - repository: artifactory.internal.sysdig.com \ No newline at end of file + repository: us-docker.pkg.dev \ No newline at end of file diff --git a/.github/workflows/push-dry-run.yaml b/.github/workflows/push-dry-run.yaml new file mode 100644 index 00000000..fc3b58aa --- /dev/null +++ b/.github/workflows/push-dry-run.yaml @@ -0,0 +1,27 @@ +name: Push Dry run + +# Controls when the action will run. Triggers the workflow on push or pull request +# events but only for the master branch +on: + workflow_dispatch: + +# A workflow run is made up of one or more jobs that can run sequentially or in parallel +jobs: + # This workflow contains a single job called "build" + on-success: + # The type of runner that the job will run on + runs-on: ubuntu-latest + steps: + - name: Trigger jenkins job to upload master to Quay.io + uses: toptal/jenkins-job-trigger-action@master + with: + jenkins_url: "https://jenkins.internal.sysdig.tools/" + jenkins_user: 'jenkins-bot@sysdig.com' + jenkins_token: ${{ secrets.JENKINS_BOT_API_TOKEN }} + job_name: "promcat/job/exporters/job/integrations-redis-exporter" + job_params: | + { + "DRY_RUN": "true", + "SCRATCH": "true", + "EXPORTER": "redis-exporter" + } diff --git a/.github/workflows/push.yaml b/.github/workflows/push.yaml index 3368e118..e07765b1 100644 --- a/.github/workflows/push.yaml +++ b/.github/workflows/push.yaml @@ -14,10 +14,16 @@ jobs: # The type of runner that the job will run on runs-on: ubuntu-latest steps: - - name: Upload master to Quay.io - uses: fjogeleit/http-request-action@master + - name: Trigger jenkins job to upload master to Quay.io + uses: toptal/jenkins-job-trigger-action@master with: - url: 'https://sysdig-jenkins.internal.sysdig.com/view/Integrations/job/integrations-redis-exporter/buildWithParameters?token=${{ secrets.JENKINS_PROMCAT_LAUNCH_TOKEN }}&EXPORTER=redis-exporter&DRY_RUN=false' - method: 'POST' - username: david.lorite@sysdig.com - password: ${{ secrets.JENKINS_PROMCAT_API_TOKEN }} \ No newline at end of file + jenkins_url: "https://jenkins.internal.sysdig.tools/" + jenkins_user: 'jenkins-bot@sysdig.com' + jenkins_token: ${{ secrets.JENKINS_BOT_API_TOKEN }} + job_name: "promcat/job/exporters/job/integrations-redis-exporter" + job_params: | + { + "DRY_RUN": "false", + "SCRATCH": "true", + "EXPORTER": "redis-exporter" + } \ No newline at end of file