diff --git a/.github/workflows/jenkins-nightly-smoketest.yml b/.github/workflows/jenkins-nightly-smoketest.yml deleted file mode 100644 index 360399473..000000000 --- a/.github/workflows/jenkins-nightly-smoketest.yml +++ /dev/null @@ -1,35 +0,0 @@ -name: Jenkins Nightly Smoketest -on: - workflow_dispatch: - schedule: - # Runs "at minute 28 past every 0400 GMT from GitHub main branch" - - cron: '28 4 * * *' - -# cancel older, redundant runs of same workflow on same branch -concurrency: - group: ${{ github.workflow }}-${{ github.head_ref || github.ref_name }} - cancel-in-progress: true - -jobs: - jenkins-nightly-smoketest: - runs-on: ubuntu-latest - name: POST Webhook to Jenkinstest - steps: - - name: Trigger Nightly Smoketest - uses: openziti/ziti-webhook-action@v2 - if: ${{ env.ZITI_JENKINS_WEBHOOK_URL != null }} - env: - ZITI_JENKINS_WEBHOOK_URL: ${{ secrets.ZITI_JENKINS_WEBHOOK_URL }} - with: - ziti-id: ${{ secrets.ZITI_JENKINS_IDENTITY }} - webhook-url: ${{ secrets.ZITI_JENKINS_WEBHOOK_URL }} - webhook-secret: ${{ secrets.ZITI_JENKINS_WEBHOOK_SECRET }} - data: | - ziti-version=gh-nightly-${{ github.run_id }} - branch=release-next - nightly=true - - # These were copied from the Jenkins nightly trigger job's cURL query params - # location=us-east-1 # not a valid build param in Jenkins - # deploy_branch=master # master is default in Jenkins - # destroy_delay=0 # 0 is default in Jenkins \ No newline at end of file diff --git a/.github/workflows/jenkins-smoketest.yml b/.github/workflows/jenkins-smoketest.yml deleted file mode 100644 index 76e3c47ce..000000000 --- a/.github/workflows/jenkins-smoketest.yml +++ /dev/null @@ -1,36 +0,0 @@ -name: Jenkins Smoketest -on: - workflow_call: - inputs: - ziti-version: - description: 'Semantic Version from `ziti-ci -q get-current-version`' - type: string - required: true # error if this workflow is called from main.yml and the ziti_version is missing - workflow_dispatch: - inputs: - ziti-version: - description: 'Semantic Version from `ziti-ci -q get-current-version`' - type: string - required: false # this allows manually triggering the smoketest with the UNKNOWN version default - -jobs: - jenkins-smoketest: - runs-on: ubuntu-latest - name: Jenkins On-Demand Smoketest - steps: - - name: debug ziti-version input - shell: bash - run: | - echo ziti-version=${{ inputs.ziti-version || github.event.inputs.ziti-version }} - - name: Send Webhook to Jenkinstest - uses: openziti/ziti-webhook-action@v2 - if: ${{ env.ZITI_JENKINS_WEBHOOK_URL != null }} - env: - ZITI_JENKINS_WEBHOOK_URL: ${{ secrets.ZITI_JENKINS_WEBHOOK_URL }} - with: - ziti-id: ${{ secrets.ZITI_JENKINS_IDENTITY }} - webhook-url: ${{ secrets.ZITI_JENKINS_WEBHOOK_URL }} - webhook-secret: ${{ secrets.ZITI_JENKINS_WEBHOOK_SECRET }} - data: | - ziti-version=${{ inputs.ziti-version || github.event.inputs.ziti-version }} - branch=${{ github.head_ref || github.ref }} diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 99c752626..c6acaec43 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -501,20 +501,6 @@ jobs: JFROG_API_KEY: ${{ secrets.JFROG_API_KEY }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - jenkins-smoketest: - # BEGIN smoketest-job - # - # Any event that triggers this main workflow also triggers the smoketest - # - needs: publish - name: Call the On-Demand Smoketest Workflow - # not applicable to forks - if: github.repository_owner == 'openziti' - uses: ./.github/workflows/jenkins-smoketest.yml - secrets: inherit - with: - ziti-version: ${{ needs.publish.outputs.ZITI_VERSION }} - call-publish-prerelease-docker-images: # - !cancelled() allows evaluating further conditional expressions even if # needed jobs were skipped