runner

.forgejo/run-test.sh

@@ -73,6 +73,18 @@ function main() {
 		shift
 		debug
 		;;
+	    --host_port)
+		shift
+		host_port=$1
+		;;
+	    --url)
+		shift
+		url=$1
+		;;
+	    --token)
+		shift
+		token=$1
+		;;
 	    *)
 		"${1:-run}" "$host_port" "$url" "$token"
 		return 0

.forgejo/workflows/integration.yml

@@ -19,78 +19,5 @@ jobs:
 
       - name: tests
         run: |
-          .forgejo/run-test.sh 
+          .forgejo/run-test.sh --debug --host_port ${{ steps.forgejo.outputs.host-port }} --url ${{ steps.forgejo.outputs.url }} --token ${{ steps.forgejo.outputs.token }}
-          forgejo-test-helper.sh push_self_action http://root:admin1234@${{ steps.forgejo.outputs.host-port }} root forgejo-release vTest
 
-      - name: admin user create --username testuser
-        run: |
-          forgejo='docker exec --user 1000 forgejo forgejo'
-          user=testuser
-          if ! $forgejo admin user list | grep -q "$user" ; then
-             $forgejo admin user create --username "$user" --password "admin1324" --email "$user@example.com"
-          fi
-
-      - name: build & publish
-        run: |
-          set -x
-
-          version=1.2.3
-          cat > /etc/docker/daemon.json <<EOF
-            {
-              "insecure-registries" : ["${{ steps.forgejo.outputs.host-port }}"]
-            }
-          EOF
-          systemctl restart docker
-
-          apt-get install -qq -y xz-utils
-
-          dir=$(mktemp -d)
-          trap "rm -fr $dir" EXIT
-
-          url=http://root:admin1234@${{ steps.forgejo.outputs.host-port }}
-          export FORGEJO_RUNNER_LOGS="${{ steps.forgejo.outputs.runner-logs }}"
-
-          cp -a testdata/.forgejo testdata/* $dir
-
-          #
-          # root/forgejo: owner & repository in which the release will be built
-          #
-          forgejo-test-helper.sh push $dir $url root forgejo forgejo-release ${{ steps.forgejo.outputs.token }} |& tee $dir/pushed
-          eval $(grep '^sha=' < $dir/pushed)
-          #
-          # testuser/forgejo: owner & repository in which the release will be published
-          #
-          (
-            git clone $url/root/forgejo tmp-forgejo
-            cd tmp-forgejo
-            git push $url/testuser/forgejo main
-          )
-
-          #
-          # Push a tag to trigger the build workflow and wait for it to complete
-          #
-          forgejo-test-helper.sh api POST $url repos/root/forgejo/tags ${{ steps.forgejo.outputs.token }} --data-raw '{"tag_name": "v'$version'", "target": "'$sha'"}'
-          LOOPS=180 forgejo-test-helper.sh wait_success "$url" root/forgejo $sha
-
-          #
-          # uncomment to see the logs even when everything is reported to be working ok
-          #
-          #cat $FORGEJO_RUNNER_LOGS
-
-          for user in root testuser ; do
-            for arch in amd64 arm64 ; do
-              binary=software-$version-linux-$arch
-              for suffix in '' '.xz' ; do
-                curl --fail -L -sS $url/$user/forgejo/releases/download/v$version/$binary$suffix > $binary$suffix
-                if test "$suffix" = .xz ; then
-                   unxz --keep $binary$suffix
-                fi
-                chmod +x $binary
-                ./$binary --version | grep $version
-                curl --fail -L -sS $url/$user/forgejo/releases/download/v$version/$binary$suffix.sha256 > $binary$suffix.sha256
-                shasum -a 256 --check $binary$suffix.sha256
-                rm $binary$suffix
-              done
-            done
-            docker pull ${{ steps.forgejo.outputs.host-port }}/$user/forgejo:$version
-          done

.gitignore

@@ -1,3 +1,8 @@
+.runner
+forgejo-runner-pid
+forgejo-runner-token
+forgejo-runner.clientpid
+forgejo-runner.log
 forgejo-token
 forgejo-api
 forgejo-header

README.md

@@ -10,8 +10,10 @@ export PATH=$(pwd)/setup-forgejo:$PATH
 git clone https://code.forgejo.org/actions/cascading-pr
 cd cascading-pr
 forgejo-curl.sh logout
+forgejo-runner.sh teardown
 forgejo.sh teardown
 forgejo.sh setup root admin1234 codeberg.org/forgejo/forgejo 1.21
+forgejo-runner.sh setup
 firefox http://$(cat forgejo-ip):3000
 .forgejo/run-test.sh --debug
 ```