diff --git a/.github/workflows/branch-build.yml b/.github/workflows/branch-build.yml index 8f61b26d7..5c8998da3 100644 --- a/.github/workflows/branch-build.yml +++ b/.github/workflows/branch-build.yml @@ -29,9 +29,10 @@ jobs: fetch-depth: 0 - name: Extract version id: extract-version + # FIXME run: | IMAGE_VERSION=$(git rev-parse --short HEAD) - echo "versions={\"image-version\":[\"v9.99.9-dev\",\"0.0.0-${IMAGE_VERSION}\"]}" >> $GITHUB_OUTPUT + echo "versions={\"image-version\":[\"v9.99.9-dev\"]}" >> $GITHUB_OUTPUT build: if: github.event_name != 'repository_dispatch' # skip if triggered by repository_dispatch needs: [extract-metadata] @@ -195,18 +196,18 @@ jobs: KUBECONFIG=$(k3d kubeconfig write ${{ matrix.integration }}-test-cluster) \ make test-integration-${{ matrix.integration }} - - name: Slack Notification - uses: rtCamp/action-slack-notify@v2 - if: ${{ failure() }} - env: - SLACK_USERNAME: Botkube Cloud CI - SLACK_COLOR: 'red' - SLACK_TITLE: 'Message' - SLACK_CHANNEL: 'botkube-cloud-ci-alerts' - SLACK_MESSAGE: 'Integration ${{ matrix.integration }} test failed :scream:' - SLACK_ICON_EMOJI: ':this-is-fine-fire:' - SLACK_WEBHOOK: ${{ secrets.SLACK_CI_ALERTS_WEBHOOK }} - SLACK_FOOTER: "Fingers crossed it's just an outdated/flaky test..." +# - name: Slack Notification +# uses: rtCamp/action-slack-notify@v2 +# if: ${{ failure() }} +# env: +# SLACK_USERNAME: Botkube Cloud CI +# SLACK_COLOR: 'red' +# SLACK_TITLE: 'Message' +# SLACK_CHANNEL: 'botkube-cloud-ci-alerts' +# SLACK_MESSAGE: 'Integration ${{ matrix.integration }} test failed :scream:' +# SLACK_ICON_EMOJI: ':this-is-fine-fire:' +# SLACK_WEBHOOK: ${{ secrets.SLACK_CI_ALERTS_WEBHOOK }} +# SLACK_FOOTER: "Fingers crossed it's just an outdated/flaky test..." cli-migration-e2e: name: CLI Migration E2E tests @@ -318,7 +319,7 @@ jobs: botkube_cloud_password: ${{ secrets.E2E_DEV_BOTKUBE_CLOUD_PASSWORD }} botkube_cloud_team_organization_id: ${{ secrets.E2E_DEV_BOTKUBE_CLOUD_TEAM_ORGANIZATION_ID }} botkube_cloud_free_organization_id: ${{ secrets.E2E_DEV_BOTKUBE_CLOUD_FREE_ORGANIZATION_ID }} - botkube_cloud_plugin_repo_url: "https://storage.googleapis.com/botkube-plugins-latest/plugins-dev-index.yaml" + botkube_cloud_plugin_repo_url: "https://storage.googleapis.com/botkube-plugins-latest-exp/plugins-dev-index.yaml" # FIXME slack_alerts_webhook: ${{ secrets.SLACK_CI_ALERTS_WEBHOOK }} diff --git a/.github/workflows/process-chart.yml b/.github/workflows/process-chart.yml index a6e4b3d73..e20c18b65 100644 --- a/.github/workflows/process-chart.yml +++ b/.github/workflows/process-chart.yml @@ -5,8 +5,7 @@ env: git-email: 41898282+github-actions[bot]@users.noreply.github.com HELM_DOCS_VERSION: 1.11.0 CHART_REPOSITORY: https://charts.botkube.io/ - LATEST_PLUGIN_INDEX_URL: https://storage.googleapis.com/botkube-plugins-latest/plugins-index.yaml - LATEST_X_PLUGIN_TPLS_URL: github.com/kubeshop/botkube//cmd/executor/exec/templates?ref=main + LATEST_PLUGIN_INDEX_URL: https://storage.googleapis.com/botkube-plugins-latest-exp/plugins-index.yaml # FIXME on: workflow_call: @@ -54,7 +53,6 @@ jobs: find ${HELM_FOLDER} -name "*.yaml" -exec sed -i "s/${CHART_CURRENT_VERSION}/${{ inputs.next-version }}/g" {} + find ${HELM_FOLDER} -name "*.yaml" -exec sed -i "s/${CHART_DEV_VERSION}/${{ inputs.next-version }}/g" {} + find ${HELM_FOLDER} -name "*.yaml" -exec sed -i "s~${LATEST_PLUGIN_INDEX_URL}~https://github.com/kubeshop/botkube/releases/download/${{ inputs.next-version }}/plugins-index.yaml~g" {} + - find ${HELM_FOLDER} -name "*.yaml" -exec sed -i "s~${LATEST_X_PLUGIN_TPLS_URL}~github.com/kubeshop/botkube//cmd/executor/exec/templates?ref=${{ inputs.next-version }}~g" {} + - name: Set up chart-testing uses: helm/chart-testing-action@v2.2.1 diff --git a/.github/workflows/publish-chart.yml b/.github/workflows/publish-chart.yml index 61d7db9fe..fa1937ac2 100644 --- a/.github/workflows/publish-chart.yml +++ b/.github/workflows/publish-chart.yml @@ -5,14 +5,14 @@ on: push: branches: - 'main' + - extract-plugins-and-delete-legacy-platforms # FIXME: Remove env: git-user: github-actions[bot] git-email: 41898282+github-actions[bot]@users.noreply.github.com HELM_DOCS_VERSION: 1.11.0 - CHART_REPOSITORY: https://storage.googleapis.com/botkube-latest-main-charts - LATEST_PLUGIN_INDEX_URL: https://storage.googleapis.com/botkube-plugins-latest/plugins-index.yaml - LATEST_X_PLUGIN_TPLS_URL: github.com/kubeshop/botkube//cmd/executor/exec/templates?ref=main + CHART_REPOSITORY: https://storage.googleapis.com/botkube-latest-main-charts-exp #FIXME + LATEST_PLUGIN_INDEX_URL: https://storage.googleapis.com/botkube-plugins-latest-exp/plugins-index.yaml #FIXME jobs: process-chart: @@ -60,5 +60,5 @@ jobs: uses: google-github-actions/upload-cloud-storage@v1 with: path: ${{ github.workspace }}/main-chart - destination: 'botkube-latest-main-charts/' + destination: 'botkube-latest-main-charts-exp/' # FIXME parent: false diff --git a/.github/workflows/upload-plugins.yaml b/.github/workflows/upload-plugins.yaml index 8597f31ea..5a7b66d00 100644 --- a/.github/workflows/upload-plugins.yaml +++ b/.github/workflows/upload-plugins.yaml @@ -3,6 +3,7 @@ on: push: branches: - main + - extract-plugins-and-delete-legacy-platforms # FIXME: Remove jobs: publish_plugins: runs-on: ubuntu-latest @@ -34,7 +35,7 @@ jobs: - name: Build all plugins into dist directory env: GORELEASER_CURRENT_TAG: "v0.0.0-latest" - PLUGIN_DOWNLOAD_URL_BASE_PATH: "https://storage.googleapis.com/botkube-plugins-latest" + PLUGIN_DOWNLOAD_URL_BASE_PATH: "https://storage.googleapis.com/botkube-plugins-latest-exp" # FIXME OUTPUT_MODE: "archive" run: | make gen-plugins-index @@ -42,18 +43,18 @@ jobs: uses: google-github-actions/upload-cloud-storage@v1 with: path: 'plugin-dist' - destination: 'botkube-plugins-latest/' + destination: 'botkube-plugins-latest-exp/' # FIXME glob: '*.tar.gz' parent: false - name: Upload plugin index to GCS uses: google-github-actions/upload-cloud-storage@v1 with: path: 'plugins-index.yaml' - destination: 'botkube-plugins-latest/' + destination: 'botkube-plugins-latest-exp/' # FIXME - name: Upload plugin index to GCS uses: google-github-actions/upload-cloud-storage@v1 with: path: 'plugins-dev-index.yaml' - destination: 'botkube-plugins-latest/' + destination: 'botkube-plugins-latest-exp/' # FIXME - name: 'Disable caching' - run: 'gsutil -m setmeta -h "Cache-Control: no-cache, no-store" gs://botkube-plugins-latest/*' + run: 'gsutil -m setmeta -h "Cache-Control: no-cache, no-store" gs://botkube-plugins-latest-exp/*' # FIXME diff --git a/helm/botkube/values.yaml b/helm/botkube/values.yaml index abf38dff0..4c82e7d6b 100644 --- a/helm/botkube/values.yaml +++ b/helm/botkube/values.yaml @@ -932,7 +932,7 @@ plugins: repositories: # -- This repository serves officially supported Botkube plugins. botkube: - url: https://storage.googleapis.com/botkube-plugins-latest/plugins-index.yaml + url: https://storage.googleapis.com/botkube-plugins-latest-exp/plugins-index.yaml # FIXME # headers: {} # optional headers for plugins repository. # -- Configure Incoming webhook for source plugins. diff --git a/test/cloud-slack-dev-e2e/cloud_slack_dev_e2e_test.go b/test/cloud-slack-dev-e2e/cloud_slack_dev_e2e_test.go index ca7e1fe41..e464b189d 100644 --- a/test/cloud-slack-dev-e2e/cloud_slack_dev_e2e_test.go +++ b/test/cloud-slack-dev-e2e/cloud_slack_dev_e2e_test.go @@ -78,7 +78,7 @@ type BotkubeCloudConfig struct { TeamOrganizationID string FreeOrganizationID string - PluginRepoURL string `envconfig:"default=https://storage.googleapis.com/botkube-plugins-latest/plugins-dev-index.yaml"` + PluginRepoURL string `envconfig:"default=https://storage.googleapis.com/botkube-plugins-latest-exp/plugins-dev-index.yaml"` // FIXME } func TestCloudSlackE2E(t *testing.T) { @@ -344,7 +344,7 @@ func TestCloudSlackE2E(t *testing.T) { }) params := helmx.InstallChartParams{ - RepoURL: "https://storage.googleapis.com/botkube-latest-main-charts", + RepoURL: "https://storage.googleapis.com/botkube-latest-main-charts-exp", // FIXME RepoName: "botkube", Name: "botkube", Namespace: "botkube", diff --git a/test/e2e/migration_test.go b/test/e2e/migration_test.go index 483c1e288..49ae81ab6 100644 --- a/test/e2e/migration_test.go +++ b/test/e2e/migration_test.go @@ -29,6 +29,7 @@ import ( const ( // using latest version (without `--version` flag) + // FIXME helmCmdFmt = `helm upgrade botkube --install --namespace botkube --create-namespace --wait \ --set communications.default-group.discord.enabled=true \ --set communications.default-group.discord.channels.default.id=%s \ @@ -38,7 +39,7 @@ const ( --set executors.k8s-default-tools.botkube/kubectl.enabled=true \ --set analytics.disable=true \ --set image.tag=v9.99.9-dev \ - --set plugins.repositories.botkube.url=https://storage.googleapis.com/botkube-plugins-latest/plugins-index.yaml \ + --set plugins.repositories.botkube.url=https://storage.googleapis.com/botkube-plugins-latest-exp/plugins-index.yaml \ botkube/botkube` //nolint:gosec // false positive