diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1b15f4da..b6ac9206 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,6 +18,7 @@ env: # a step 'if env.AWS_USR' != ""', so we copy these to succinctly test whether # credentials have been provided before trying to run steps that need them. DOCKER_USR: ${{ secrets.DOCKER_USR }} + XPKG_ACCESS_ID: ${{ secrets.XPKG_ACCESS_ID }} AWS_USR: ${{ secrets.AWS_USR }} jobs: @@ -302,7 +303,15 @@ jobs: with: username: ${{ secrets.DOCKER_USR }} password: ${{ secrets.DOCKER_PSW }} - + + - name: Login to Upbound + uses: docker/login-action@v1 + if: env.XPKG_ACCESS_ID != '' + with: + registry: xpkg.upbound.io + username: ${{ secrets.XPKG_ACCESS_ID }} + password: ${{ secrets.XPKG_TOKEN }} + - name: Publish Artifacts to S3 and Docker Hub run: make -j2 publish BRANCH_NAME=${GITHUB_REF##*/} if: env.AWS_USR != '' && env.DOCKER_USR != '' @@ -319,4 +328,4 @@ jobs: CHANNEL: master AWS_ACCESS_KEY_ID: ${{ secrets.AWS_USR }} AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_PSW }} - \ No newline at end of file + diff --git a/cluster/local/integration_tests.sh b/cluster/local/integration_tests.sh index 9e307361..c24ff9c5 100755 --- a/cluster/local/integration_tests.sh +++ b/cluster/local/integration_tests.sh @@ -130,8 +130,8 @@ echo "${PVC_YAML}" | "${KUBECTL}" create -f - # install crossplane from master channel echo_step "installing crossplane from master channel" "${HELM3}" repo add crossplane-stable https://charts.crossplane.io/stable -# chart_version="$("${HELM3}" search repo crossplane-master/crossplane --devel | awk 'FNR == 2 {print $2}')" -echo_info "using crossplane version 1.6.4" +chart_version="$("${HELM3}" search repo crossplane-stable/crossplane | awk 'FNR == 2 {print $2}')" +echo_info "using crossplane version ${chart_version}" echo # we replace empty dir with our PVC so that the /cache dir in the kind node # container is exposed to the crossplane pod