From c71a122584639df4e62656cd1f608476a12598f2 Mon Sep 17 00:00:00 2001 From: anton Date: Tue, 2 Apr 2024 22:40:31 +0200 Subject: [PATCH] Removed Travis's scripts and updated README.md --- .../package_and_push_helm_chart.yaml | 20 +++-- .travis.yml | 84 ------------------ .travis/add_pod_annotations.sh | 24 ----- .travis/ci-service-account.json.enc | Bin 2320 -> 0 bytes README.md | 7 +- charts/.travis/build.sh | 9 -- charts/.travis/install.sh | 16 ---- 7 files changed, 16 insertions(+), 144 deletions(-) delete mode 100644 .travis.yml delete mode 100755 .travis/add_pod_annotations.sh delete mode 100644 .travis/ci-service-account.json.enc delete mode 100755 charts/.travis/build.sh delete mode 100755 charts/.travis/install.sh diff --git a/.github/workflows/package_and_push_helm_chart.yaml b/.github/workflows/package_and_push_helm_chart.yaml index ba9a210f..df53c4e4 100644 --- a/.github/workflows/package_and_push_helm_chart.yaml +++ b/.github/workflows/package_and_push_helm_chart.yaml @@ -5,17 +5,14 @@ on: branches: - dev - release + - devops/FAIRSPC-55_github_actions workflow_dispatch: inputs: name: description: "Manual trigger for Helm chart packaging and pushing" - release_type: - description: "Release or snapshot version?" - required: true - default: "SNAPSHOT" - options: - - "SNAPSHOT" - - "RELEASE" + version: + description: "Version of the Helm chart to push" + required: false jobs: deploy: @@ -42,9 +39,16 @@ jobs: - name: Prepare version run: | VERSION=$(cat ./VERSION) - if [[ ${{ github.event.inputs.release_type }} = "SNAPSHOT" ]] || [[ $BRANCH = "dev" ]]; then + BRANCH=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}} + echo "Building images from the branch: $BRANCH" + if [ $BRANCH != "release" ]; then VERSION=$VERSION-SNAPSHOT fi + # override version of custom input is provided + if [[ -n "${{ github.event.inputs.version }}" ]]; then + VERSION=${{ github.event.inputs.version }} + fi + echo "Helm charts version to be deployed: $VERSION" echo "VERSION=$VERSION" >> $GITHUB_ENV - name: Package and Push Helm chart to repository diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 304f8611..00000000 --- a/.travis.yml +++ /dev/null @@ -1,84 +0,0 @@ -dist: jammy - -language: java - -env: - global: - - NODE_VERSION="18.16.0" - - APPNAME="fairspace-keycloak" - - ORG="thehyve" - - ARTIFACT_BUILD_FILE="" - - BUILD_SCRIPTS_REPO="thehyve/fairspace-build-scripts" - - DEPLOYMENT_CONFIG_REPO="thehyve/fairspace-config-private" - - ACCOUNT_CONFIG_DIR="./.travis" - - RELEASE_BRANCH="release" - - SNAPSHOT_BRANCH="dev" - - DOCKER_USERNAME="fairspace" - - GCP_PROJECT="fairspace-207108" - - GITHUB_USERNAME="fairspace-ci" - - SHOULD_DEPLOY=false - # DEPLOYMENT RELATED VARIABLES - REQUIRED IF SHOULD_DEPLOY=true - # - SNAPSHOT_CONTEXT="gke_fairspace-207108_europe-west1-b_fairspacecicluster" - # - SNAPSHOT_CLUSTER_NAME="fairspacecicluster" - # - SNAPSHOT_CLUSTER_ZONE="europe-west1-b" - # - RELEASE_CONTEXT="gke_fairspace-207108_europe-west1-b_fairspacecicluster" - # - RELEASE_CLUSTER_NAME="fairspacecicluster" - # - RELEASE_CLUSTER_ZONE="europe-west1-b" - - # DOCKER_PASSWORD=... - - secure: "vXd6WTtZ5wO5hXi2Tm9lgSDWXkf8MyZ+zkSKr0DNXRqBFPPGpifzhB8qN1qRYVLD8UsdrFwU4q53kxqlmWd6/P9dQkFuFpkouZkax4LRoP7QhRbxcLUcbcqEui4pA579uAIynu61q+furr+4Yl6RcTTG6nE9T43eofgGQqf0haVRM9hYeeMXjHGBNPooHJepGxFqpMBSN/+nb3MoB9dOzqc+dvj99Z5BLiAnl5t9ZCHcqTaLlZpwhWY+vR5WyEj7D2mkAiswXmRCOB7n0z2dN/mxDvMLtXAM7pfmmpQUoZYI8bGUc2zBnzKb5slSvvVG4vgZKx0Tv8RDQnpj7geLmIoiWYfz4wGolp1kn4tvjIA5pSx/xXxpOAX/dVAM9hvtOYt48Unr76UzpQm1e3+2DYIZdf0jz5n9V3H2ZqYY81UWFI8nSTmvaO/dw3GtLiPts/+FAHPsXVAkUFmDf0AGrIXIQ7P31pLgtXwXMslr7HkDUDmdN3PMHn30QhJWsaFe+MWXKnqNjCgIfflHpmAVBkbjsKWG1wpsNUHB66rq3U9UPCXpxu1XVpJLxT5QfVXR8p10s4YBvhwHHqhBDbMETTCYz4Q5T7YwgWIU0JTwCut+OMmW4rR3IAwmgIF0Pnr64y+fZL+qNXSJp/W/wrN84ZoGFGBflSnaCIhK7dm+paA=" - - # GITHUB_PASSWORD=.... - - secure: "HGHpt9j5qHkz6lsXYiEB+sxorhOw5g1r+Ys3S8cuPoxsAkLp3xfopAZ/+4ICX2gSSkyWh1tymTkAjFyt+C97Ejv9Jy03PQRRVbv5YxtD515y3ZP9qbN5OjZnfJjAJMATP2yYQczfH05XBHTEgF/RsGEpV+dxyEdD2ZSyeMfxGnjng3EHh34sMv4Vppf56V7al30i+g5gCO4gQrAAJ+UXtfePKcvp9/WuLDJRtyTO6vt1xkF9W5FrMOLNntnOy4rRV7TzgkhkUzDcxyEoA7uFWlV55Wf7SHiqtF4dtlYs3euZZ8ocbkqYL6y7wmPIOke/Ib7SmQYmulEP7lkJDH+v0RUHHMeKcMjUZdA/ADmopxuW1uQ2+V8arIFKM5Tb4GPCr6PEvOMDm5Nrauo9LuXPVmSJ5jcR6w1PAMdLjONGWJLNTKeP72T7DmikMNhjWtJl2IeevBXiDAtPW3AU++BibnkrOk3q0ENhrF/oK6e2c0PWtkDaqgQMJi2uSu9Tni8LWiwZQLmUkA/vAkllz6dwZZ9ooA26qtVAUnPeMepNLU/9+HBQio6hbtHN5hL+3Sekv/16ZgfI72Bhb8Eo3ElnXoeybAmhM5fGGSvgYtp+VEHCmXSIvW5XDgcv3f2sA60bldSuu+T5yw76EIlM7eCke+x84g7HxAPBLffGJxZqS8g=" - -cache: - directories: - - $HOME/downloads - - $HOME/.gradle - -before_install: - - nvm install $NODE_VERSION - - export KUBE_CONFIG_ENC_KEY=$encrypted_6c9f30024cb1_key - - export KUBE_CONFIG_ENC_IV=$encrypted_6c9f30024cb1_iv - - git clone https://$GITHUB_USERNAME:$GITHUB_PASSWORD@github.com/$BUILD_SCRIPTS_REPO ci - - export BUILD_SCRIPTS_DIR=$(pwd)/ci - - 'if [[ "$SHOULD_DEPLOY" = "true" ]]; then git clone https://$GITHUB_USERNAME:$GITHUB_PASSWORD@github.com/$DEPLOYMENT_CONFIG_REPO ci-config ; fi' - - 'if [[ "$SHOULD_DEPLOY" = "true" ]]; then export DEPLOYMENT_CONFIG_DIR="$(pwd)/ci-config/fairspace-keycloak" ; fi' - - 'if [[ "$SHOULD_DEPLOY" = "true" ]] && [[ "$TRAVIS_BRANCH" = "$SNAPSHOT_BRANCH" ]]; then export ALLOW_SNAPSHOTS=1 DEPLOY_TARGET=ci KUBERNETES_CONTEXT="$SNAPSHOT_CONTEXT" DEPLOY_PLATFORM="GCP" KUBERNETES_CONTEXT="$SNAPSHOT_CONTEXT" CLUSTER_NAME="$SNAPSHOT_CLUSTER_NAME" CLUSTER_ZONE="$SNAPSHOT_CLUSTER_ZONE"; fi' - - 'if [[ "$SHOULD_DEPLOY" = "true" ]] && [[ "$TRAVIS_BRANCH" = "$RELEASE_BRANCH" ]]; then export DEPLOY_TARGET=test KUBERNETES_CONTEXT="$RELEASE_CONTEXT" CLUSTER_NAME="$RELEASE_CLUSTER_NAME" DEPLOY_PLATFORM="GCP" CLUSTER_ZONE="$RELEASE_CLUSTER_ZONE"; fi' - - source ./ci/setup_env.sh - - 'if [[ "$SHOULD_RELEASE" ]] ; then export NEED_INTERNAL_HELM=1 RELEASE_PLATFORM="GCP" ; fi' - -jobs: - include: - - stage: build - cache: false - name: Build helm charts - install: - - source charts/.travis/install.sh - script: - - charts/.travis/build.sh - - if: branch = release AND type != pull_request - cache: false - stage: Versioning - name: Set tag and update version - script: - - "./ci/helm/tag.sh" - - "ci/versioning/add_tag_to_git.sh" - - "ci/versioning/set_next_version.sh" - - stage: deploy - cache: false - if: env(SHOULD_DEPLOY) = true and branch = dev and type != pull_request - install: - - source charts/.travis/install.sh - script: - - travis_wait ci/helm/deploy.sh $DEPLOY_TARGET - -notifications: - slack: - rooms: - - secure: "dpJL60bCwWHBbY23/6gTUWjLFo5FXp2+56k6EoxtFFwH7a8I9RAnuxHgbNknVypY115GgSpueSSbePaSlbGeHqZ/AQ1e6q2r80RQPBe+lFSc3+0DTkq00p97xqqFjpSSTE4+wYSGldP9GVpN89LLc9wZbSeI+GH3nr/vgMjTA8OPsUFPr49n/VNnqUm4I5SA2YKxYlVZuUoWGqWqj107LBiFFgOCUSeGgeM9wafFA86rxmkNU3h77g6N4rJrx8SUZrjFg158KHsN+nfnc6kFTHx+CJg+WSPx3T7Stf0XPPQe7pDgMpOucNH7n6duqa9V6ldhG9jati9BmSa74EzxzLGuhwVUiZgWQ0dZaND6hfTQnWk3/XKI9lNyUQ5uuCYuHaT33CiEiIt/HkigFoMgX6QkCPqk9eYAfVsOLz2nnqfmtT7AMM6xcCXrHRjJ7O/ZIo1UZaR5GwUD7j3JVA6UgNzztIBr+h/CyjvRSWQklOpVAYhCmuHJ1bEfKXfUx4Qkc0k5IaoefZ5uW5Ny64VBZoQMNt5MRxysKS9/ITqY4CALSxf0oBkQbxms5Oz967zFOWhD3+QL6sHAkLkVaUro1Y89Epm1YMqAaawC0DAFvrmeDXCITuPcDpsFHWVfpPLphxLA6d+TLZ5BNrdCpCj9GpDnFD0UkQ+wodZdfI6YaVo=" - template: - - "Build <%{build_url}|#%{build_number}> (<%{compare_url}|%{commit}>) of %{repository_slug}@%{branch}" - - "Latest commit: %{commit_message} - by %{author}" - - "Result: %{result} in %{duration}" diff --git a/.travis/add_pod_annotations.sh b/.travis/add_pod_annotations.sh deleted file mode 100755 index 53577c74..00000000 --- a/.travis/add_pod_annotations.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash -# -# This script will add a pod annotations for each project that has -# been built to ensure -# that the pod will be recreated for new SNAPSHOT images -# -# Required env variables: -# $APPNAME -# $COMMIT_ID -# -DIR=$(dirname $0) - -# If we have no changes at all in any of the projects, we can skip -# pod annotations -if $DIR/build-condition.sh $TRAVIS_COMMIT_RANGE projects/; then - echo "Adding pod annotations" - - # Remove empty pod annotations - sed -i -e "s/podAnnotations: { }//" charts/fairspace-keycloak/values.yaml - - # Add a pod annotation in the values.yaml file - echo -e "\npodAnnotations:" >> charts/fairspace-keycloak/values.yaml - echo -e " fairspace-keycloak:\n commit: \"$COMMIT_ID\"\n" >> charts/fairspace-keycloak/values.yaml -fi diff --git a/.travis/ci-service-account.json.enc b/.travis/ci-service-account.json.enc deleted file mode 100644 index ff0f6bf2bde5a0f9e05b41f3f2b0f123d081c6c0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2320 zcmV+r3Geo_q4|XNKqkBxx_lpr_ZBtnc6sqB8Y`u>ZkANhZmu)GO|!;8yeBF@dGCZ$ z%pC+Sg27I5h}Qo*oNS`x|Iw_MI=i?qK&$)LhngGGbWxHhswpz>3006mqF&%4RiiHl zD#i+#b;=_}C(zVv()CY0jK44qFliStevGv5?&wKf1|Z#@n{4rj&RIFWP0l!2i1a!ytA-2-zP7HNVeCE-uWMvGwX`~K`NJ5V8p zMG1r1XqNl?Ix!}-C5Zo1qi@E9z0oA`{CXbCRTKTQ@Q4UrgjZAxsd6h3clNT|8B=%q z@|Te1mO1fM+{0I$fone7BN8surau6b&D#d{{13UA@L(pTri6sj$~laQBlza zz(uLu{2XIZQM;j;bv#KCt|~1vcKQvbj;cEFBj!+k;6c!$?viHx1iS2Ga|X-j zFr=?$t-3G5YwPsSQHjD*C8dJ@%8Q&mBfU4Zw}7iO@$YNvo8Zw9cWKoXe-`^sF?WS@ z1!J>F>t<2WB!4d;`xGSdi(gk)Ym4ejGwA5)eLhiKvchpVfs^>4Uh+$z@&n9iGChgY zAmEzHBB8)hc5km=;6t=FpxVURsnRS}lOlTGZ;fvW^frwg0~{^f=rdOe%tr8^NpX9b z(>1=jAOr~DiK__ZL(9d}O{vVLxqjjLOU^ctUqt9Ygj-3hm>hL!U@Kd7ZZbcC!Z`ns zd0}@3ArUV`ytyf>akQhH)h`?Y$7=@-(6eDfQL1i5PrCLp7m^ar(~DNOm6k?*_HfwZ zrfr`f&!U=!UiBqSR3Ee_YGwNZL=h-L*mmXV)CyIsP%L*X1JpyPda`03+TaM}XgKft zvC^cUzfUcQ!#Uk$>=yC)`&Tkt$@d`l7NLw+h~EeTOZoti_SKbJH2`~C4Nq2C@)Mi& zrFK=l$$p@c1wZa=0YMhmaxCX*RniA3fdnI@aUy~hVkwXn)I^;P9+$;Eo69&P* zXNtZ}Qfm}qU2imu1w(^xs>)@E*i2~_*&={G;Tidahi&Caz@pX+C5T69=jx} zD3p@WRJvZHs@fL!FA5vGXDwOZ77~I(#2%jPabV_L){{aI(<&W}BYtAM_dy5&VdrTuXM3?F_B_!gv9X&fVvkdkMyO2+ zY3~Mx(;Qk}39VATNQkU+9xW$dh77;l>2Y)I-jaK0Q2LXBf@Nse@gzK&)ar1W$y=;ayhCYm@LNsuOJ|3ABjq=R%)=7dzJ7^ol6AAm6G+2 zLJ!66<?WoKS{QD#`H>PdJOb~AbUSVvq?<~ z7u?R!_zr7N-UsTvR%_Qu-I|qOwAB31Bg+AmV8mrF%kEmO>g|suo~-dhl;y?*T=y^R z({*RBr4Wn>h4ceG$843lQ&Nl$pEq_VuP(&pivk;BS+-p~=1Mucc%S!SG`7>-9VwJCaVTXOHppvOirEpb5hv1nZw~jt)1xHgyxtLs3 zx}*2gE#IUBF>;F-V%~F!zw(T(g%@y&h*V*Y&Gm`c5qPHYY3t8sRo|LsydxelfLC(r0%%Q z?aW)MlGsI6))|(u-S_u#4Ea z2p6xPn&6Y;ACNsdf}oX?>9f>WlV)hE4H0lDkxv@9Axbf7G1YuVS2GwFZZi!`DbmUon{qgTqYYULfX~RmnB;JLd0UN5wC4L zU6`%EDsiQ^t(KV39$q=phZmN(8KP_+)&PFXvN4HF!|_gFeW>0z{F#j#hX7AudYpp2 z%IM;{d(@Nd$r6~*1*aN+-OFaJ4IZ|%cRx~Dr?vVf&8r0!xqt%?uq=>LH zw=j>w6LvVVFu!Qx^=jW=j*h30?o$ueYBaT*D|6b11%}+dPyvHQ3Cr5UHyVC|37%UT zeR;W$AFTZsT1Dv@i>{miP%i|76AQb8R?@iy`^3_=o<44